merge 1.3 r843:844 into trunk

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

View File

@@ -639,7 +639,8 @@ CServerApp::createScreen()
#if WINAPI_MSWINDOWS
return new CScreen(new CMSWindowsScreen(true, args().m_noHooks));
#elif WINAPI_XWINDOWS
return new CScreen(new CXWindowsScreen(args().m_display, true));
return new CScreen(new CXWindowsScreen(
args().m_display, true, args().m_disableXInitThreads));
#elif WINAPI_CARBON
return new CScreen(new COSXScreen(true));
#endif