use running_from_source_tree()

[ardour.git] / gtk2_ardour / ardour_ui.cc

diff --git a/gtk2_ardour/ardour_ui.cc b/gtk2_ardour/ardour_ui.cc
index 91c00065c6d4fe86120fc12ddc767a57d4e1c4a7..8ace0cee3885b92bea2ccad439c07644ab1b8a85 100644 (file)
--- a/gtk2_ardour/ardour_ui.cc
+++ b/gtk2_ardour/ardour_ui.cc
@@ -331,8 +331,7 @@ ARDOUR_UI::ARDOUR_UI (int *argcp, char **argvp[], const char* localedir)
 
        if (string (VERSIONSTRING).find (".pre") != string::npos) {
                /* check this is not being run from ./ardev etc. */
-               gchar const *x = g_getenv ("ARDOUR_THEMES_PATH");
-               if (!x || string (x).find ("gtk2_ardour") == string::npos) {
+               if (!running_from_source_tree ()) {
                        pre_release_dialog ();
                }
        }
@@ -4005,7 +4004,9 @@ ARDOUR_UI::start_duplicate_routes ()
 void
 ARDOUR_UI::add_route ()
 {
-       int count;
+       if (!add_route_dialog.get (false)) {
+               add_route_dialog->signal_response().connect (sigc::mem_fun (*this, &ARDOUR_UI::add_route_dialog_finished));
+       }
 
        if (!_session) {
                return;
@@ -4016,7 +4017,14 @@ ARDOUR_UI::add_route ()
                return;
        }
 
-       ResponseType r = (ResponseType) add_route_dialog->run ();
+       add_route_dialog->set_position (WIN_POS_MOUSE);
+       add_route_dialog->present();
+}
+
+void
+ARDOUR_UI::add_route_dialog_finished (int r)
+{
+       int count;
 
        add_route_dialog->hide();