Display warning when closing Audio Setup dialog with engine stopped
authorTim Mayberry <mojofunk@gmail.com>
Sat, 26 Sep 2015 10:43:47 +0000 (20:43 +1000)
committerTim Mayberry <mojofunk@gmail.com>
Wed, 30 Sep 2015 23:10:19 +0000 (09:10 +1000)
Only show warning when a session is loaded

gtk2_ardour/ardour_ui.h
gtk2_ardour/engine_dialog.cc

index 7d3d4adf23ac7970d674809d03e601a58eec7f1b..1c1ee78bfb08cdfbf2e12e2b81b39ca4d07e7bd4 100644 (file)
@@ -294,6 +294,8 @@ class ARDOUR_UI : public Gtkmm2ext::UI, public ARDOUR::SessionHandlePtr
 
        void show_ui_prefs ();
 
+       bool check_audioengine();
+
        void update_tearoff_visibility ();
 
        void setup_profile ();
@@ -719,7 +721,6 @@ class ARDOUR_UI : public Gtkmm2ext::UI, public ARDOUR::SessionHandlePtr
 
        void check_memory_locking ();
 
-       bool check_audioengine();
        void audioengine_setup ();
 
        void display_message (const char *prefix, gint prefix_len,
index 8799d6aa8ff2f411a68c9936d73b1efd35e70276..fe8a594193050712b0f7ba7b697df035a2b4b1fe 100644 (file)
@@ -442,6 +442,11 @@ EngineControl::on_response (int response_id)
                                on_delete_event ((GdkEventAny*) &ev);
                                break;
                        }
+               case RESPONSE_CANCEL:
+                       if (ARDOUR_UI::instance() && ARDOUR_UI::instance()->session_loaded) {
+                               ARDOUR_UI::instance()->check_audioengine ();
+                       }
+                       // fall through
                default:
                        hide ();
        }