reverse logic in plugin GUI key handling

[ardour.git] / gtk2_ardour / main.cc

diff --git a/gtk2_ardour/main.cc b/gtk2_ardour/main.cc
index 998337ed0994b3a8b499bf3a9dd8fea0b7599950..2e6c9daf82a8c9976bec50e2d85dea693cdb5251 100644 (file)
--- a/gtk2_ardour/main.cc
+++ b/gtk2_ardour/main.cc
@@ -216,9 +216,9 @@ static void command_line_parse_error (int *argc, char** argv[]) {
        // an MSVC app, let the user know we encountered a parsing error.
        Gtk::Main app(argc, argv); // Calls 'gtk_init()'
 
-       Gtk::MessageDialog dlgReportParseError (_("\n   Ardour could not understand your command line      "),
+       Gtk::MessageDialog dlgReportParseError (string_compose (_("\n   %1 could not understand your command line      "), PROGRAM_NAME),
                        false, MESSAGE_ERROR, BUTTONS_CLOSE, true);
-       dlgReportParseError.set_title (_("An error was encountered while launching Ardour"));
+       dlgReportParseError.set_title (string_compose (_("An error was encountered while launching %1"), PROGRAM_NAME));
        dlgReportParseError.run ();
 }
 
@@ -251,6 +251,8 @@ int ardour_main (int argc, char *argv[])
 int main (int argc, char *argv[])
 #endif
 {
+       ARDOUR::check_for_old_configuration_files();
+
        fixup_bundle_environment (argc, argv, &localedir);
 
        load_custom_fonts(); /* needs to happen before any gtk and pango init calls */