aboutsummaryrefslogtreecommitdiff
path: root/src/common/Utilities/Timer.h
diff options
context:
space:
mode:
authorShauren <shauren.trinity@gmail.com>2016-04-26 18:10:17 +0200
committerShauren <shauren.trinity@gmail.com>2016-04-26 18:15:10 +0200
commit5bbc58f32d0086f9a7c7421b492942a1b2be840a (patch)
tree603f9ae5e86d15d2daa456c73bbf68c592feaed1 /src/common/Utilities/Timer.h
parentb641d7ba251c540a93e8989c02013a5f97bc5c99 (diff)
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)
Diffstat (limited to 'src/common/Utilities/Timer.h')
-rw-r--r--src/common/Utilities/Timer.h4
1 files 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<milliseconds>(system_clock::now() - ApplicationStartTime).count());
+ return uint32(duration_cast<milliseconds>(steady_clock::now() - ApplicationStartTime).count());
}
inline uint32 getMSTimeDiff(uint32 oldMSTime, uint32 newMSTime)