archive/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2024-09-21 03:41:42 +02:00
Code Issues Projects Releases Packages Wiki Activity

Fixes the timer returning 1 when it should return 0. The case mentioned by the comment does not exist anymore.

Browse source 
Also added a IsRunning function as it was impossible to know whether it had been started or not (I will use it in later PRs but it should be there anyway)
This commit is contained in:
Filoppi 2020-07-01 22:29:30 +03:00
parent 2147707641
commit 4b5ca9923c
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();