Don't hide Audio Setup dialog when clicking 'OK' if engine fails to start

This has to be handled in two places, in ARDOUR_UI::do_audio_midi_setup and in
the dialogs response handler and in as the window can also be triggered via the
window action manager.

1 files changed, 15 insertions, 7 deletions

diff --git a/gtk2_ardour/ardour_ui.cc b/gtk2_ardour/ardour_ui.cc
index ee356fb2a9..2a4a8c530d 100644
--- a/gtk2_ardour/ardour_ui.cc
+++ b/gtk2_ardour/ardour_ui.cc
@@ -4828,13 +4828,21 @@ ARDOUR_UI::do_audio_midi_setup (uint32_t desired_sample_rate)
 	audio_midi_setup->set_desired_sample_rate (desired_sample_rate);
 	audio_midi_setup->set_position (WIN_POS_CENTER);
 
-	switch (audio_midi_setup->run()) {
-	case Gtk::RESPONSE_OK:
-		return 0;
-	case Gtk::RESPONSE_APPLY:
-		return 0;
-	default:
-		return -1;
+	int response;
+
+	while (true) {
+		response = audio_midi_setup->run();
+		switch (response) {
+		case Gtk::RESPONSE_OK:
+			if (!AudioEngine::instance()->running()) {
+				continue;
+			} else {
+				return 0;
+			}
+			return 0;
+		default:
+			return -1;
+		}
 	}
 }