From f3c5f3ba06eb7394303c6500094f6d1f58d4092a Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Sat, 10 Mar 2012 15:52:22 -0600
Subject: Automated update from Qt3

---
 src/kernel/qapplication_x11.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'src/kernel/qapplication_x11.cpp')

diff --git a/src/kernel/qapplication_x11.cpp b/src/kernel/qapplication_x11.cpp
index 874afe060..0dbd6ce78 100644
--- a/src/kernel/qapplication_x11.cpp
+++ b/src/kernel/qapplication_x11.cpp
@@ -1646,7 +1646,8 @@ void tqt_init_internal( int *argcptr, char **argv,
     setlocale( LC_NUMERIC, "C" );	// make sprintf()/scanf() work
 
 #if defined(QT_THREAD_SUPPORT)
-    if ( tqt_is_gui_used ) {
+    if (( tqt_is_gui_used ) && ( !display )) {
+	// If TQt is running standalone with a GUI, initialize X11 threading
 	XInitThreads();
     }
 #endif
-- 
cgit v1.2.1