ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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
parent 3c70fb7277 4b5ca9923c
commit 695a96498a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Source/Core/Common/Timer.cpp
View File

@ -118,10 +118,9 @@ void Timer::AddTimeDifference()
// Get the time elapsed since the Start() // Get the time elapsed since the Start()
u64 Timer::GetTimeElapsed() u64 Timer::GetTimeElapsed()
{ {
// If we have not started yet, return 1 (because then I don't // If we have not started yet, return zero
// have to change the FPS calculation in CoreRerecording.cpp .
if (m_StartTime == 0) if (m_StartTime == 0)
return 1; return 0;
// Return the final timer time if the timer is stopped // Return the final timer time if the timer is stopped
if (!m_Running) if (!m_Running)

2
Source/Core/Common/Timer.h
View File

@ -23,6 +23,8 @@ public:
u64 GetTimeDifference(); u64 GetTimeDifference();
void AddTimeDifference(); void AddTimeDifference();
bool IsRunning() const { return m_Running; }
static void IncreaseResolution(); static void IncreaseResolution();
static void RestoreResolution(); static void RestoreResolution();
static u64 GetTimeSinceJan1970(); static u64 GetTimeSinceJan1970();