Revert "Workaround for Issue #5041 - prevent synergys from shutting down when screen saver activates"

This reverts commit beac70f90c37b626cb7b0ea7bf2d18fdd3729013.
This commit is contained in:
Jerry (Xinyu Hou) 2015-12-02 15:03:23 -08:00 committed by Xinyu Hou
parent 92a3c47ed2
commit 1ac8db56d9
1 changed files with 1 additions and 4 deletions

View File

@ -853,10 +853,7 @@ MSWindowsDesks::checkDesk()
// if we are told to shut down on desk switch, and this is not the // if we are told to shut down on desk switch, and this is not the
// first switch, then shut down. // first switch, then shut down.
// Issue #5041 workaround - prevent synergys from shutting down when screen if (m_stopOnDeskSwitch && m_activeDesk != NULL && name != m_activeDeskName) {
// 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())); LOG((CLOG_DEBUG "shutting down because of desk switch to \"%s\"", name.c_str()));
m_events->addEvent(Event(Event::kQuit)); m_events->addEvent(Event(Event::kQuit));
return; return;