From 1ac8db56d97dfd60516682ddbd78416f2f384e7e Mon Sep 17 00:00:00 2001 From: "Jerry (Xinyu Hou)" Date: Wed, 2 Dec 2015 15:03:23 -0800 Subject: [PATCH] Revert "Workaround for Issue #5041 - prevent synergys from shutting down when screen saver activates" This reverts commit beac70f90c37b626cb7b0ea7bf2d18fdd3729013. --- src/lib/platform/MSWindowsDesks.cpp | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/src/lib/platform/MSWindowsDesks.cpp b/src/lib/platform/MSWindowsDesks.cpp index 98fcbb7d..c88801d8 100644 --- a/src/lib/platform/MSWindowsDesks.cpp +++ b/src/lib/platform/MSWindowsDesks.cpp @@ -853,10 +853,7 @@ MSWindowsDesks::checkDesk() // if we are told to shut down on desk switch, and this is not the // first switch, then shut down. - // Issue #5041 workaround - prevent synergys from shutting down when screen - // saver activates - It does not come back cleanly. - if (m_stopOnDeskSwitch && m_activeDesk != NULL && name != m_activeDeskName - && !m_screensaver->isActive()) { + if (m_stopOnDeskSwitch && m_activeDesk != NULL && name != m_activeDeskName) { LOG((CLOG_DEBUG "shutting down because of desk switch to \"%s\"", name.c_str())); m_events->addEvent(Event(Event::kQuit)); return;