From 8969326a1645e5bce6045882e6b83546b054a9c1 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sat, 10 Mar 2012 15:51:18 -0600 Subject: Fix potential crash when Qt3 is used as part of another application due to multiple calls to XLib threading init function (cherry picked from commit 1db4f237a710955a817c7aca65a716d85573304b) --- src/kernel/qapplication_x11.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/kernel/qapplication_x11.cpp b/src/kernel/qapplication_x11.cpp index f8dd445..c2bb456 100644 --- a/src/kernel/qapplication_x11.cpp +++ b/src/kernel/qapplication_x11.cpp @@ -1633,7 +1633,8 @@ void qt_init_internal( int *argcptr, char **argv, setlocale( LC_NUMERIC, "C" ); // make sprintf()/scanf() work #if defined(QT_THREAD_SUPPORT) - if ( qt_is_gui_used ) { + if (( qt_is_gui_used ) && ( !display )) { + // If Qt is running standalone with a GUI, initialize X11 threading XInitThreads(); } #endif -- cgit v1.2.1