diff options
author | David Robillard <d@drobilla.net> | 2009-10-27 18:00:45 +0000 |
---|---|---|
committer | David Robillard <d@drobilla.net> | 2009-10-27 18:00:45 +0000 |
commit | c71f419920fc10b16a0448c636761e7c696e58a6 (patch) | |
tree | 9567cf006d165e6c089883845f532b910bb7646c /gtk2_ardour | |
parent | da85f65ec01ce50372f70393db7421d170754b10 (diff) |
Make ARDOUR::init safer.
git-svn-id: svn://localhost/ardour2/branches/3.0@5950 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour')
-rw-r--r-- | gtk2_ardour/main.cc | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/gtk2_ardour/main.cc b/gtk2_ardour/main.cc index bf1e6a3978..fdea4cb754 100644 --- a/gtk2_ardour/main.cc +++ b/gtk2_ardour/main.cc @@ -312,14 +312,16 @@ int main (int argc, char *argv[]) fixup_bundle_environment (); #endif - Glib::thread_init(); + if (!Glib::thread_supported()) + Glib::thread_init(); + gtk_set_locale (); #ifdef VST_SUPPORT - /* this does some magic that is needed to make GTK and Wine's own - X11 client interact properly. - */ - gui_init (&argc, &argv); + /* this does some magic that is needed to make GTK and Wine's own + X11 client interact properly. + */ + gui_init (&argc, &argv); #endif (void) bindtextdomain (PACKAGE, localedir); @@ -380,7 +382,7 @@ int main (int argc, char *argv[]) cerr << _("Cannot install SIGPIPE error handler") << endl; } - try { + try { ui = new ARDOUR_UI (&argc, &argv); } catch (failed_constructor& err) { error << _("could not create ARDOUR GUI") << endmsg; |