fix merge conflicts from master

[ardour.git] / gtk2_ardour / main.cc

diff --git a/gtk2_ardour/main.cc b/gtk2_ardour/main.cc
index ef96423fb58c827bd1197c0574d3ea3f3d1cac40..dfa0bda94540a713972721bbb322d29bbd8e4568 100644 (file)
--- a/gtk2_ardour/main.cc
+++ b/gtk2_ardour/main.cc
@@ -483,10 +483,6 @@ int main (int argc, char *argv[])
                exit (1);
        }
 
-       if (curvetest_file) {
-               return curvetest (curvetest_file);
-       }
-
        cout << PROGRAM_NAME
             << VERSIONSTRING
             << _(" (built using ")
@@ -514,7 +510,14 @@ int main (int argc, char *argv[])
 
        /* some GUI objects need this */
 
-       PBD::ID::init ();
+       if (!ARDOUR::init (ARDOUR_COMMAND_LINE::use_vst, ARDOUR_COMMAND_LINE::try_hw_optimization, localedir)) {
+               error << string_compose (_("could not initialize %1."), PROGRAM_NAME) << endmsg;
+               exit (1);
+       }
+
+       if (curvetest_file) {
+               return curvetest (curvetest_file);
+       }
 
 #ifndef WIN32
        if (::signal (SIGPIPE, sigpipe_handler)) {