Merge pull request #8922 from Filoppi/timer-fixes

Timer fixes
dolphin-emu · Jul 12, 2020 · 695a964 · 695a964
2 parents 3c70fb7 + 4b5ca99
commit 695a964
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/Source/Core/Common/Timer.cpp b/Source/Core/Common/Timer.cpp
@@ -118,10 +118,9 @@ void Timer::AddTimeDifference()
 // Get the time elapsed since the Start()
 u64 Timer::GetTimeElapsed()
 {
-  // If we have not started yet, return 1 (because then I don't
-  // have to change the FPS calculation in CoreRerecording.cpp .
+  // If we have not started yet, return zero
   if (m_StartTime == 0)
-    return 1;
+    return 0;
 
   // Return the final timer time if the timer is stopped
   if (!m_Running)

diff --git a/Source/Core/Common/Timer.h b/Source/Core/Common/Timer.h
@@ -23,6 +23,8 @@ class Timer
   u64 GetTimeDifference();
   void AddTimeDifference();
 
+  bool IsRunning() const { return m_Running; }
+
   static void IncreaseResolution();
   static void RestoreResolution();
   static u64 GetTimeSinceJan1970();