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.
This commit is contained in:
Nye Liu 2015-10-01 22:30:35 -07:00 committed by Xinyu Hou
parent 48069f1a3b
commit 3e37518b92
1 changed files with 4 additions and 1 deletions

View File

@ -853,7 +853,10 @@ 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.
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())); 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;