From: dooglus <dooglus@1f10aa63-cdf2-0310-b900-c93c546f37ac>
Date: Thu, 11 Oct 2007 16:32:21 +0000 (+0000)
Subject: Only initialise threads if they aren't already initialised.
X-Git-Url: https://git.pterodactylus.net/?a=commitdiff_plain;h=e10333c5709c495f1cb1f10d06aab3012b0dbc17;p=synfig.git

Only initialise threads if they aren't already initialised.


git-svn-id: http://svn.voria.com/code@908 1f10aa63-cdf2-0310-b900-c93c546f37ac
---

diff --git a/synfig-studio/trunk/src/gtkmm/app.cpp b/synfig-studio/trunk/src/gtkmm/app.cpp
index 5b4b54b..0c2bd84 100644
--- a/synfig-studio/trunk/src/gtkmm/app.cpp
+++ b/synfig-studio/trunk/src/gtkmm/app.cpp
@@ -1103,7 +1103,10 @@ App::App(int *argc, char ***argv):
 
 	gdk_rgb_init();
 
-	Glib::thread_init();
+	// don't call thread_init() if threads are already initialised
+	// on some machines bonobo_init() initialised threads before we get here
+	if (!g_thread_supported())
+		Glib::thread_init();
 
 	distance_system=Distance::SYSTEM_UNITS;