From fda85c2f6f1cd0876adf24823916c2affef2d15f Mon Sep 17 00:00:00 2001
From: Jack Andersen <jackoalan@gmail.com>
Date: Sun, 27 Dec 2015 13:32:32 -1000
Subject: [PATCH] animation timing fix

---
 specter/lib/ModalWindow.cpp | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/specter/lib/ModalWindow.cpp b/specter/lib/ModalWindow.cpp
index f2f58fe74..c78e4b430 100644
--- a/specter/lib/ModalWindow.cpp
+++ b/specter/lib/ModalWindow.cpp
@@ -350,6 +350,7 @@ void ModalWindow::think()
     case Phase::BuildIn:
     {
         bool loadVerts = false;
+        int doneCount = 0;
         if (m_frame > WIRE_START)
         {
             float wt = (m_frame-WIRE_START) / float(WIRE_FRAMES);
@@ -357,6 +358,8 @@ void ModalWindow::think()
             m_lineTime = CubicEase(wt);
             setLineVerts(m_width, m_height, pf, m_lineTime);
             setLineColors(wt);
+            if (wt == 2.f)
+                ++doneCount;
             loadVerts = true;
         }
         if (m_frame > SOLID_START)
@@ -364,6 +367,8 @@ void ModalWindow::think()
             float ft = (m_frame-SOLID_START) / float(SOLID_FRAMES);
             ft = Zeus::Math::clamp(0.f, ft, 2.f);
             setFillColors(ft);
+            if (ft == 2.f)
+                ++doneCount;
             loadVerts = true;
         }
         if (res.fontCacheReady() && m_frame > CONTENT_START)
@@ -374,8 +379,10 @@ void ModalWindow::think()
             tt = Zeus::Math::clamp(0.f, tt, 1.f);
             updateContentOpacity(tt);
             if (tt == 1.f)
-                m_phase = Phase::Showing;
+                ++doneCount;
         }
+        if (doneCount == 3)
+            m_phase = Phase::Showing;
         if (loadVerts)
             m_vertsBuf->load(&m_verts, sizeof(m_verts));
         ++m_frame;