From 2ea87a601a5bf469d432da4bce2bc84f2162acfa Mon Sep 17 00:00:00 2001 From: Lynix Date: Thu, 20 Mar 2014 23:00:54 +0100 Subject: [PATCH] Fixed Clock::Get[*] still running when clock is paused Former-commit-id: f2063a94251fc27da492d0d37bd42355125a1a24 --- src/Nazara/Core/Clock.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/Nazara/Core/Clock.cpp b/src/Nazara/Core/Clock.cpp index 2c2fa2db5..53b1bcc65 100644 --- a/src/Nazara/Core/Clock.cpp +++ b/src/Nazara/Core/Clock.cpp @@ -55,7 +55,11 @@ nzUInt64 NzClock::GetMicroseconds() const { NazaraLock(m_mutex); - return m_elapsedTime + (NzGetMicroseconds()-m_refTime); + nzUInt64 elapsedMicroseconds = m_elapsedTime; + if (!m_paused) + elapsedMicroseconds += (NzGetMicroseconds() - m_refTime); + + return elapsedMicroseconds; } nzUInt64 NzClock::GetMilliseconds() const