From 3e37518b927974db6cd2e3175175ed9717cd0e23 Mon Sep 17 00:00:00 2001 From: Nye Liu Date: Thu, 1 Oct 2015 22:30:35 -0700 Subject: [PATCH] Workaround for Issue #5041 - prevent synergys from shutting down when screen saver activates When it is restarted, and screen saver is active, the clipboard no longer works correctly. The desk swap detection routine just below does not work properly when the desktop goes from screensaver back to normal. If it did, probably this workaround would not be needed. --- src/lib/platform/MSWindowsDesks.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/lib/platform/MSWindowsDesks.cpp b/src/lib/platform/MSWindowsDesks.cpp index c88801d8..98fcbb7d 100644 --- a/src/lib/platform/MSWindowsDesks.cpp +++ b/src/lib/platform/MSWindowsDesks.cpp @@ -853,7 +853,10 @@ MSWindowsDesks::checkDesk() // if we are told to shut down on desk switch, and this is not the // first switch, then shut down. - if (m_stopOnDeskSwitch && m_activeDesk != NULL && name != m_activeDeskName) { + // 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()) { LOG((CLOG_DEBUG "shutting down because of desk switch to \"%s\"", name.c_str())); m_events->addEvent(Event(Event::kQuit)); return;