From 41532886616c2714db94cb31a7f0105589f27be3 Mon Sep 17 00:00:00 2001
From: Carl Hetherington <carl@carlh.net>
Date: Sat, 8 Jan 2011 15:19:44 +0000
Subject: Fix cancel button in route group dialogue, as per #3689.

git-svn-id: svn://localhost/ardour2/branches/3.0@8483 d708f5d6-7413-0410-9779-e7cbd77b26cf
---
 gtk2_ardour/route_group_dialog.cc | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'gtk2_ardour/route_group_dialog.cc')

diff --git a/gtk2_ardour/route_group_dialog.cc b/gtk2_ardour/route_group_dialog.cc
index a807741d1d..b7c8895d8e 100644
--- a/gtk2_ardour/route_group_dialog.cc
+++ b/gtk2_ardour/route_group_dialog.cc
@@ -145,9 +145,14 @@ RouteGroupDialog::do_run ()
 {
 	while (1) {
 		int const r = run ();
+		if (r == Gtk::RESPONSE_CANCEL) {
+			/* cancel, so just bail now */
+			return Gtk::RESPONSE_CANCEL;
+		}
 
 		if (unique_name ()) {
-			return (r == Gtk::RESPONSE_CANCEL);
+			/* not cancelled and the name is ok, so all is well */
+			return false;
 		}
 	
 		_group->set_name (_initial_name);
-- 
cgit v1.2.3