From 2aa7dff8923b0f2a51a564a3c57f6862db15eaba Mon Sep 17 00:00:00 2001 From: Shauren Date: Tue, 26 Apr 2016 18:10:17 +0200 Subject: [PATCH] Core/Misc: Use steady_clock instead of system_clock for calculating ms timers. This makes update diffs immune to systemwide time changes (cherry picked from commit 406ac4f4b492e8733d0c1e6142838b3fff8c80a3) --- src/common/Utilities/Timer.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/common/Utilities/Timer.h b/src/common/Utilities/Timer.h index cdce08caaf0..f66bb90c98e 100644 --- a/src/common/Utilities/Timer.h +++ b/src/common/Utilities/Timer.h @@ -25,9 +25,9 @@ inline uint32 getMSTime() { using namespace std::chrono; - static const system_clock::time_point ApplicationStartTime = system_clock::now(); + static const steady_clock::time_point ApplicationStartTime = steady_clock::now(); - return uint32(duration_cast(system_clock::now() - ApplicationStartTime).count()); + return uint32(duration_cast(steady_clock::now() - ApplicationStartTime).count()); } inline uint32 getMSTimeDiff(uint32 oldMSTime, uint32 newMSTime)