Gracefully handle templates that lack contents in their description or created_with...

[ardour.git] / gtk2_ardour / main.cc

diff --git a/gtk2_ardour/main.cc b/gtk2_ardour/main.cc
index ef35ac64b493811dbc0cdba3059bfe404ae4ffdd..9c9981bcc382087363e888ec44f32ef781681868 100644 (file)
--- a/gtk2_ardour/main.cc
+++ b/gtk2_ardour/main.cc
@@ -48,8 +48,9 @@
 #include "ardour/filesystem_paths.h"
 
 #include <gtkmm/main.h>
+#include <gtkmm/stock.h>
+
 #include <gtkmm2ext/application.h>
-#include <gtkmm2ext/popup.h>
 #include <gtkmm2ext/utils.h>
 
 #include "ardour_ui.h"
@@ -58,7 +59,7 @@
 #include "enums.h"
 #include "bundle_env.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 #ifdef PLATFORM_WINDOWS
 #include <fcntl.h> // Needed for '_fmode'
@@ -69,6 +70,10 @@
 #include "gtk2ardour-version.h"
 #endif
 
+#ifdef LXVST_SUPPORT
+#include <gdk/gdkx.h>
+#endif
+
 using namespace std;
 using namespace Gtk;
 using namespace ARDOUR_COMMAND_LINE;
@@ -291,12 +296,19 @@ int main (int argc, char *argv[])
                Glib::thread_init();
        }
 
+#ifdef LXVST_SUPPORT
+       XInitThreads ();
+#endif
+
 #ifdef HAVE_FFTW35F
        fftwf_make_planner_thread_safe ();
 #endif
 
 #ifdef ENABLE_NLS
-       setlocale (LC_ALL, "");
+       /* initialize C locale to user preference */
+       if (ARDOUR::translations_are_enabled ()) {
+               setlocale (LC_ALL, "");
+       }
 #endif
 
        console_madness_begin();
@@ -366,6 +378,11 @@ int main (int argc, char *argv[])
 
        if (!ARDOUR::init (ARDOUR_COMMAND_LINE::use_vst, ARDOUR_COMMAND_LINE::try_hw_optimization, localedir.c_str())) {
                error << string_compose (_("could not initialize %1."), PROGRAM_NAME) << endmsg;
+               Gtk::Main main (argc, argv);
+               Gtk::MessageDialog msg (string_compose (_("Could not initialize %1 (likely due to corrupt config files).\n"
+                                                         "Run %1 from a commandline for more information."), PROGRAM_NAME),
+                                       false, Gtk::MESSAGE_ERROR , Gtk::BUTTONS_OK, true);
+               msg.run ();
                exit (1);
        }
 
@@ -405,8 +422,22 @@ int main (int argc, char *argv[])
        ui = 0;
 
        ARDOUR::cleanup ();
+#ifndef NDEBUG
+       if (getenv ("ARDOUR_RUNNING_UNDER_VALGRIND")) {
+               Glib::usleep(100000);
+               sched_yield();
+       }
+#endif
+
        pthread_cancel_all ();
 
+#ifndef NDEBUG
+       if (getenv ("ARDOUR_RUNNING_UNDER_VALGRIND")) {
+               Glib::usleep(100000);
+               sched_yield();
+       }
+#endif
+
        console_madness_end ();
 
        return 0;