From 7cf88118885699a23daa4768285d512fc06d5a2a Mon Sep 17 00:00:00 2001
From: Piotr Dziwinski <piotrdz@gmail.com>
Date: Thu, 13 Jun 2013 17:25:58 +0200
Subject: Fix for #195

 * loading time now is not counted in elapsed time
---
 src/app/app.cpp | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

(limited to 'src/app/app.cpp')

diff --git a/src/app/app.cpp b/src/app/app.cpp
index 932e61e..7acef31 100644
--- a/src/app/app.cpp
+++ b/src/app/app.cpp
@@ -1264,13 +1264,24 @@ void CApplication::SuspendSimulation()
 void CApplication::ResumeSimulation()
 {
     m_simulationSuspended = false;
+    InternalResumeSimulation();
 
+    GetLogger()->Info("Resume simulation\n");
+}
+
+void CApplication::ResetTimeAfterLoading()
+{
+    InternalResumeSimulation();
+
+    GetLogger()->Trace("Resume simulation on loading\n");
+}
+
+void CApplication::InternalResumeSimulation()
+{
     GetSystemUtils()->GetCurrentTimeStamp(m_baseTimeStamp);
     GetSystemUtils()->CopyTimeStamp(m_curTimeStamp, m_baseTimeStamp);
     m_realAbsTimeBase = m_realAbsTime;
     m_absTimeBase = m_exactAbsTime;
-
-    GetLogger()->Info("Resume simulation\n");
 }
 
 bool CApplication::GetSimulationSuspended() const
-- 
cgit v1.2.3-1-g7c22