Gtkmm2ext::Choice now inherits from Gtk::Dialog; embed/import rate mismatch dialog no longer hangs in recursive Main::run() call

git-svn-id: svn://localhost/trunk/ardour2@414 d708f5d6-7413-0410-9779-e7cbd77b26cf

1 files changed, 8 insertions, 12 deletions

diff --git a/gtk2_ardour/visual_time_axis.cc b/gtk2_ardour/visual_time_axis.cc
index 2b9a55bb5c..23af21aaca 100644
--- a/gtk2_ardour/visual_time_axis.cc
+++ b/gtk2_ardour/visual_time_axis.cc
@@ -279,18 +279,14 @@ VisualTimeAxis::remove_this_time_axis(void* src)
 
 	Gtkmm2ext::Choice prompter (prompt, choices);
 
-	prompter.chosen.connect(sigc::ptr_fun(Gtk::Main::quit));
-	prompter.show_all ();
-
-	Gtk::Main::run ();
-
-	if (prompter.get_choice() == 0)
-	{
-		/*
-		   defer to idle loop, otherwise we'll delete this object
-		   while we're still inside this function ...
-		*/
-	  Glib::signal_idle().connect(bind(sigc::ptr_fun(&VisualTimeAxis::idle_remove_this_time_axis), this, src));
+	if (prompter.run () == RESPONSE_ACCEPT) {
+		if (prompter.get_choice() == 0) {
+			/*
+			  defer to idle loop, otherwise we'll delete this object
+			  while we're still inside this function ...
+			*/
+			Glib::signal_idle().connect(bind(sigc::ptr_fun(&VisualTimeAxis::idle_remove_this_time_axis), this, src));
+		}
 	}
 }