summaryrefslogtreecommitdiffstats
path: root/src/OSSupport
diff options
context:
space:
mode:
authorMattes D <github@xoft.cz>2014-11-04 15:47:55 +0100
committerMattes D <github@xoft.cz>2014-11-04 15:47:55 +0100
commit0d15261601317efa062d2573ec8d074a89ad4846 (patch)
tree1d42dc7d56bea2f6340f88d69f5d9a397f9973ef /src/OSSupport
parentMerge branch 'master' into c++11Events (diff)
downloadcuberite-0d15261601317efa062d2573ec8d074a89ad4846.tar
cuberite-0d15261601317efa062d2573ec8d074a89ad4846.tar.gz
cuberite-0d15261601317efa062d2573ec8d074a89ad4846.tar.bz2
cuberite-0d15261601317efa062d2573ec8d074a89ad4846.tar.lz
cuberite-0d15261601317efa062d2573ec8d074a89ad4846.tar.xz
cuberite-0d15261601317efa062d2573ec8d074a89ad4846.tar.zst
cuberite-0d15261601317efa062d2573ec8d074a89ad4846.zip
Diffstat (limited to 'src/OSSupport')
-rw-r--r--src/OSSupport/Event.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/OSSupport/Event.cpp b/src/OSSupport/Event.cpp
index e05de8e15..7007b5dd2 100644
--- a/src/OSSupport/Event.cpp
+++ b/src/OSSupport/Event.cpp
@@ -37,9 +37,9 @@ void cEvent::Wait(void)
bool cEvent::Wait(int a_TimeoutMSec)
{
- std::chrono::steady_clock::time_point dst = std::chrono::steady_clock::now() + std::chrono::milliseconds(a_TimeoutMSec);
+ std::chrono::system_clock::time_point dst = std::chrono::system_clock::now() + std::chrono::milliseconds(a_TimeoutMSec);
std::unique_lock<std::mutex> Lock(m_Mutex); // We assume that this lock is acquired without much delay - we are the only user of the mutex
- while (m_ShouldWait && (std::chrono::steady_clock::now() < dst))
+ while (m_ShouldWait && (std::chrono::system_clock::now() < dst))
{
switch (m_CondVar.wait_until(Lock, dst))
{