From ee20d08080734c06846e2a1d38d41ec0d3f908e7 Mon Sep 17 00:00:00 2001
From: "Jerry (Xinyu Hou)" <xinyu@synergy-project.org>
Date: Tue, 24 Nov 2015 11:51:19 -0800
Subject: [PATCH] Revert "Revert "Fixed using wrong local variable #4723""

This reverts commit a0beae0f4b5578a16178e6324f2d1f588caeb442.
---
 src/lib/platform/MSWindowsWatchdog.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/lib/platform/MSWindowsWatchdog.cpp b/src/lib/platform/MSWindowsWatchdog.cpp
index c57fb278..837db1de 100644
--- a/src/lib/platform/MSWindowsWatchdog.cpp
+++ b/src/lib/platform/MSWindowsWatchdog.cpp
@@ -552,11 +552,12 @@ MSWindowsWatchdog::getActiveDesktop(LPSECURITY_ATTRIBUTES security)
 		ARCH->lockMutex(m_mutex);
 		int waitTime = 0;
 		while (!m_ready) {
+			if (waitTime >= MAXIMUM_WAIT_TIME) {
 				break;
 			}
 
 			ARCH->waitCondVar(m_condVar, m_mutex, 1.0);
-			i++;
+			waitTime++;
 		}
 		m_ready = false;
 		ARCH->unlockMutex(m_mutex);