Merge pull request #8922 from Filoppi/timer-fixes

Timer fixes
This commit is contained in:
Tilka
2020-07-13 00:16:45 +01:00
committed by GitHub
2 changed files with 4 additions and 3 deletions

View File

@ -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)