From aec52c36e6e9c5961f2fee2e4eb68c60317bca48 Mon Sep 17 00:00:00 2001
From: "Jerry (Xinyu Hou)" <xinyu@synergy-project.org>
Date: Wed, 27 May 2015 10:18:45 -0700
Subject: [PATCH] Added timeout for waiting active destop result #4723

---
 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 <UserEnv.h>
 #include <Shellapi.h>
 
+#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);