summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-07-23 08:53:47 -0500
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-07-23 08:53:47 -0500
commit5b1e2195666cac3f1bf9aae94d52980f18ddfd3f (patch)
tree86080701e626f7bd6a97164b1cd7c2e0562d0617
parent7da66b85298ec3e5bb7d2f5ad9f4c603c1e99cb5 (diff)
downloadtqt3-5b1e2195666cac3f1bf9aae94d52980f18ddfd3f.tar.gz
tqt3-5b1e2195666cac3f1bf9aae94d52980f18ddfd3f.zip
Automated update from Qt3
-rw-r--r--src/kernel/qthread_unix.cpp6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/kernel/qthread_unix.cpp b/src/kernel/qthread_unix.cpp
index 13c820e23..fb8f45318 100644
--- a/src/kernel/qthread_unix.cpp
+++ b/src/kernel/qthread_unix.cpp
@@ -405,7 +405,11 @@ void TQThread::start(Priority priority)
d->thread_id = NULL;
// Legacy glib versions require this threading system initialization call
- g_thread_init(NULL);
+ if (!GLIB_CHECK_VERSION (2, 32, 0)) {
+ if( ! g_thread_get_initialized () ) {
+ g_thread_init(NULL);
+ }
+ }
GThread* glib_thread_handle = g_thread_create((GThreadFunc)TQThreadInstance::start, d->args, false, NULL);
if (glib_thread_handle) {