summaryrefslogtreecommitdiff
path: root/gtk2_ardour/add_route_dialog.cc
diff options
context:
space:
mode:
authorCarl Hetherington <carl@carlh.net>2011-01-08 02:35:46 +0000
committerCarl Hetherington <carl@carlh.net>2011-01-08 02:35:46 +0000
commitaf0030a6de8bc8109bb3c343289816c91377b76c (patch)
tree2f4c5d4274d45ff369a4ed08612ef51e5c1ced75 /gtk2_ardour/add_route_dialog.cc
parent150d3fdfbfeabde96d528312aa22e839a5aa5f3e (diff)
Make Route Group dialog instant-apply. Disallow identically-named route group; fixes #3689.
git-svn-id: svn://localhost/ardour2/branches/3.0@8481 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/add_route_dialog.cc')
-rw-r--r--gtk2_ardour/add_route_dialog.cc12
1 files changed, 5 insertions, 7 deletions
diff --git a/gtk2_ardour/add_route_dialog.cc b/gtk2_ardour/add_route_dialog.cc
index 3330b14b92..2b91cebff9 100644
--- a/gtk2_ardour/add_route_dialog.cc
+++ b/gtk2_ardour/add_route_dialog.cc
@@ -399,17 +399,15 @@ AddRouteDialog::group_changed ()
plist.add (Properties::active, true);
g->apply_changes (plist);
- RouteGroupDialog d (g, Gtk::Stock::NEW);
- int const r = d.do_run ();
+ RouteGroupDialog d (g, true);
- if (r == Gtk::RESPONSE_OK) {
+ if (d.do_run ()) {
+ delete g;
+ route_group_combo.set_active (2);
+ } else {
_session->add_route_group (g);
add_route_group (g);
route_group_combo.set_active (3);
- } else {
- delete g;
-
- route_group_combo.set_active (2);
}
}
}