From 5fae9efe78513306edcfd3a0d9cafa39fd686584 Mon Sep 17 00:00:00 2001 From: "Jerry (Xinyu Hou)" Date: Tue, 24 Nov 2015 11:51:00 -0800 Subject: [PATCH] Revert "Revert "Added timeout for waiting active destop result #4723"" This reverts commit 0f8a5687719605af59d901f08dfbb5dde74a7dc9. --- src/lib/platform/MSWindowsWatchdog.cpp | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/lib/platform/MSWindowsWatchdog.cpp b/src/lib/platform/MSWindowsWatchdog.cpp index fdb2c72a..c57fb278 100644 --- a/src/lib/platform/MSWindowsWatchdog.cpp +++ b/src/lib/platform/MSWindowsWatchdog.cpp @@ -37,6 +37,7 @@ #include #include +#define MAXIMUM_WAIT_TIME 3 enum { kOutputBufferSize = 4096 }; @@ -549,8 +550,13 @@ MSWindowsWatchdog::getActiveDesktop(LPSECURITY_ATTRIBUTES security) } ARCH->lockMutex(m_mutex); + int waitTime = 0; while (!m_ready) { + break; + } + ARCH->waitCondVar(m_condVar, m_mutex, 1.0); + i++; } m_ready = false; ARCH->unlockMutex(m_mutex);