From: Lars Op den Kamp Date: Wed, 7 Dec 2011 22:57:53 +0000 (+0100) Subject: Merge branch 'master' of github.com:Pulse-Eight/libcec X-Git-Tag: upstream/2.2.0~1^2~44^2~15 X-Git-Url: https://git.piment-noir.org/?a=commitdiff_plain;h=7837bab3f716a157f901a43bf6367e6203e4c60b;hp=a98b2f2e462da89f64f987ac9e4e19d9e0a5e437;p=deb_libcec.git Merge branch 'master' of github.com:Pulse-Eight/libcec --- diff --git a/src/lib/CECProcessor.cpp b/src/lib/CECProcessor.cpp index 210f44b..e1e03b8 100644 --- a/src/lib/CECProcessor.cpp +++ b/src/lib/CECProcessor.cpp @@ -1365,11 +1365,11 @@ void CCECBusScan::WaitUntilIdle(void) if (IsStopped()) return; - int64_t iWaitTime = 3000 - (GetTimeMs() - m_processor->GetLastTransmission()); + int32_t iWaitTime = 3000 - (int32_t)(GetTimeMs() - m_processor->GetLastTransmission()); while (iWaitTime > 0) { Sleep(iWaitTime); - iWaitTime = 3000 - (GetTimeMs() - m_processor->GetLastTransmission()); + iWaitTime = 3000 - (int32_t)(GetTimeMs() - m_processor->GetLastTransmission()); } }