summaryrefslogtreecommitdiff
path: root/gtk2_ardour/route_group_dialog.cc
diff options
context:
space:
mode:
authorCarl Hetherington <carl@carlh.net>2011-01-08 15:19:44 +0000
committerCarl Hetherington <carl@carlh.net>2011-01-08 15:19:44 +0000
commit41532886616c2714db94cb31a7f0105589f27be3 (patch)
tree28e852c3400d01376dba9b96532186c24065f48c /gtk2_ardour/route_group_dialog.cc
parentbee34078e7426f6662a3c21ca3288808650c0aa1 (diff)
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
Diffstat (limited to 'gtk2_ardour/route_group_dialog.cc')
-rw-r--r--gtk2_ardour/route_group_dialog.cc7
1 files changed, 6 insertions, 1 deletions
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);