backup/barrier
1
0
Fork 0
mirror of https://github.com/debauchee/barrier.git synced 2026-02-12 22:55:53 +08:00
Code Issues Projects Releases Wiki Activity

merge 1.3 r843:844 into trunk

Browse Source
This commit is contained in:
Nick Bolton
2011-01-17 00:41:14 +00:00
parent 47e12f465b
commit 728e8bb035
7 changed files with 21 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
lib/platform/CXWindowsScreen.cpp
View File

@@ -80,7 +80,7 @@
CXWindowsScreen* CXWindowsScreen::s_screen = NULL;
CXWindowsScreen::CXWindowsScreen(const char* displayName, bool isPrimary, int mouseScrollDelta) :
CXWindowsScreen::CXWindowsScreen(const char* displayName, bool isPrimary, bool disableXInitThreads, int mouseScrollDelta) :
m_isPrimary(isPrimary),
m_mouseScrollDelta(mouseScrollDelta),
m_display(NULL),
@@ -109,12 +109,11 @@ CXWindowsScreen::CXWindowsScreen(const char* displayName, bool isPrimary, int mo
if (mouseScrollDelta==0) m_mouseScrollDelta=120;
s_screen = this;
// initializes Xlib support for concurrent threads.
if (XInitThreads() == 0)
{
throw XArch("XInitThreads() returned zero");
if (!disableXInitThreads) {
// initializes Xlib support for concurrent threads.
if (XInitThreads() == 0)
throw XArch("XInitThreads() returned zero");
}
// set the X I/O error handler so we catch the display disconnecting
XSetIOErrorHandler(&CXWindowsScreen::ioErrorHandler);