(5) debugging with nowhiskey - remove stupid lack of scaling caused by redisplaying all regions for every source file removed; fix for illegal audio device selection in audio setup dialog; stuff related to drawing/dragging regionheights (disabled at present)

git-svn-id: svn://localhost/ardour2/branches/2.0-ongoing@3458 d708f5d6-7413-0410-9779-e7cbd77b26cf

1 files changed, 10 insertions, 6 deletions

diff --git a/gtk2_ardour/ardour_ui.cc b/gtk2_ardour/ardour_ui.cc
index a5e1f0b46a..8c9a965826 100644
--- a/gtk2_ardour/ardour_ui.cc
+++ b/gtk2_ardour/ardour_ui.cc
@@ -2247,10 +2247,13 @@ ARDOUR_UI::get_session_parameters (bool backend_audio_is_running, bool should_be
 		fontconfig_dialog();
 
 		if (!backend_audio_is_running) {
-			if (new_session_dialog->engine_control.setup_engine ()) {
-				new_session_dialog->hide ();
+			int ret = new_session_dialog->engine_control.setup_engine ();
+			if (ret < 0) {
 				return false;
-			} 
+			} else if (ret > 0) {
+				response = Gtk::RESPONSE_REJECT;
+				goto try_again;
+			}
 		}
 		
 		if (create_engine ()) {
@@ -2354,7 +2357,7 @@ ARDOUR_UI::get_session_parameters (bool backend_audio_is_running, bool should_be
 			}
 		}
 
-	} while (response == Gtk::RESPONSE_NONE);
+	} while (response == Gtk::RESPONSE_NONE || response == Gtk::RESPONSE_REJECT);
 
   done:
 	show();
@@ -2745,8 +2748,11 @@ After cleanup, unused audio files will be moved to a \
 	}
 
 	if (session->cleanup_sources (rep)) {
+		editor->finish_cleanup ();
 		return;
 	}
+	
+	editor->finish_cleanup ();
 
 	checker.hide();
 	display_cleanup_results (rep, 
@@ -2760,8 +2766,6 @@ release an additional\n\
 %4 %5bytes of disk space.\n"
 					 ));
 
-
-
 }
 
 void