Merge 1.4.1 r594:595 into trunk

This commit is contained in:
Nick Bolton 2010-06-12 17:40:28 +00:00
parent a8eb2a3bfd
commit b62582444e
4 changed files with 40 additions and 10 deletions

View file

@ -107,10 +107,11 @@ CXWindowsScreen::CXWindowsScreen(const char* displayName, bool isPrimary, int mo
s_screen = this;
// initializes Xlib support for concurrent threads.
if (XInitThreads() == 0)
{
throw XArch("XInitThreads() returned zero");
}
// ...which breaks badly on RHEL for some reason, upstream #194
//if (XInitThreads() == 0)
//{
// throw XArch("XInitThreads() returned zero");
//}
// set the X I/O error handler so we catch the display disconnecting