summaryrefslogtreecommitdiffstats
path: root/src/OSSupport/Event.cpp
diff options
context:
space:
mode:
authorMattes D <github@xoft.cz>2014-12-07 21:37:47 +0100
committerMattes D <github@xoft.cz>2014-12-07 21:37:47 +0100
commitc65bb6341dfc25ae937bd12c9e41855fb27fdccb (patch)
tree4c2596b52bdc02c964e08cb4473fe061822e8a0b /src/OSSupport/Event.cpp
parentMerge remote-tracking branch 'origin/master' into c++11Events (diff)
downloadcuberite-c65bb6341dfc25ae937bd12c9e41855fb27fdccb.tar
cuberite-c65bb6341dfc25ae937bd12c9e41855fb27fdccb.tar.gz
cuberite-c65bb6341dfc25ae937bd12c9e41855fb27fdccb.tar.bz2
cuberite-c65bb6341dfc25ae937bd12c9e41855fb27fdccb.tar.lz
cuberite-c65bb6341dfc25ae937bd12c9e41855fb27fdccb.tar.xz
cuberite-c65bb6341dfc25ae937bd12c9e41855fb27fdccb.tar.zst
cuberite-c65bb6341dfc25ae937bd12c9e41855fb27fdccb.zip
Diffstat (limited to '')
-rw-r--r--src/OSSupport/Event.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/OSSupport/Event.cpp b/src/OSSupport/Event.cpp
index d519ad63f..d6ba937f9 100644
--- a/src/OSSupport/Event.cpp
+++ b/src/OSSupport/Event.cpp
@@ -35,11 +35,11 @@ void cEvent::Wait(void)
-bool cEvent::Wait(int a_TimeoutMSec)
+bool cEvent::Wait(unsigned a_TimeoutMSec)
{
- std::chrono::system_clock::time_point dst = std::chrono::system_clock::now() + std::chrono::microseconds(a_TimeoutMSec * 1000);
+ auto 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::system_clock::now() < dst))
+ while (m_ShouldWait && (std::chrono::system_clock::now() <= dst))
{
switch (m_CondVar.wait_until(Lock, dst))
{