mirror of
https://github.com/debauchee/barrier.git
synced 2026-05-09 07:22:21 +08:00
removed restart function from platform. no longer trying to
restart if the X server connection was lost; since synergy is likely to be started by xdm or the user's xsession, it's better for synergy to simply terminate when the connection is lost. synergy will still restart due to other errors. also fixed numerous other minor bugs and cleaned some stuff up (like app error codes are now consistent and enumerated in Version.h, for lack of a better place). and boosted version and protocol numbers.
This commit is contained in:
@@ -93,6 +93,11 @@ CXWindowsScreen::CXWindowsScreen(IScreenReceiver* receiver,
|
||||
assert(m_eventHandler != NULL);
|
||||
|
||||
s_screen = this;
|
||||
|
||||
// no clipboards to start with
|
||||
for (ClipboardID id = 0; id < kClipboardEnd; ++id) {
|
||||
m_clipboard[id] = NULL;
|
||||
}
|
||||
}
|
||||
|
||||
CXWindowsScreen::~CXWindowsScreen()
|
||||
@@ -670,7 +675,10 @@ CDisplayLock::CDisplayLock(const CXWindowsScreen* screen) :
|
||||
m_mutex(&screen->m_mutex),
|
||||
m_display(screen->m_display)
|
||||
{
|
||||
assert(m_display != NULL);
|
||||
// note -- it's permitted for m_display to be NULL. that might
|
||||
// happen if we couldn't connect to the display or if the
|
||||
// display unexpectedly disconnected. the caller is expected
|
||||
// to check for NULL as necessary.
|
||||
|
||||
m_mutex->lock();
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user