Pick up newly-added route groups correctly.

git-svn-id: svn://localhost/ardour2/branches/3.0@5247 d708f5d6-7413-0410-9779-e7cbd77b26cf

diff --git a/gtk2_ardour/add_route_dialog.cc b/gtk2_ardour/add_route_dialog.cc
index 06dc51dc839eb790a6ef9d7931b1d41b9db91cd4..a8523f97f2e79e70018b6673c2e369ca9449b508 100644 (file)
--- a/gtk2_ardour/add_route_dialog.cc
+++ b/gtk2_ardour/add_route_dialog.cc
@@ -82,14 +82,11 @@ AddRouteDialog::AddRouteDialog (Session & s)
        routes_spinner.set_name ("AddRouteDialogSpinner");
 
        refill_channel_setups ();
+       refill_route_groups ();
        set_popdown_strings (track_mode_combo, track_mode_strings, true);
 
-       route_group_combo.append_text (_("No group"));
-       _session.foreach_route_group (mem_fun (*this, &AddRouteDialog::add_route_group));
-       
        channel_combo.set_active_text (channel_combo_strings.front());
        track_mode_combo.set_active_text (track_mode_strings.front());
-       route_group_combo.set_active (0);
 
        RadioButton::Group g = track_button.get_group();
        bus_button.set_group (g);
@@ -250,6 +247,8 @@ void
 AddRouteDialog::on_show ()
 {
        refill_channel_setups ();
+       refill_route_groups ();
+       
        Dialog::on_show ();
 }
 
@@ -339,3 +338,13 @@ AddRouteDialog::route_group ()
 
        return _session.route_group_by_name (route_group_combo.get_active_text());
 }
+
+void
+AddRouteDialog::refill_route_groups ()
+{
+       route_group_combo.clear ();
+       route_group_combo.append_text (_("No group"));
+       _session.foreach_route_group (mem_fun (*this, &AddRouteDialog::add_route_group));
+       route_group_combo.set_active (0);
+}
+       

diff --git a/gtk2_ardour/add_route_dialog.h b/gtk2_ardour/add_route_dialog.h
index 6103cec80cfb2bdf95eaf7529d0fe8dc585ba0d1..1221b64ba4a8c1b2ef27077d180c381ed9f22c29 100644 (file)
--- a/gtk2_ardour/add_route_dialog.h
+++ b/gtk2_ardour/add_route_dialog.h
@@ -67,6 +67,7 @@ class AddRouteDialog : public Gtk::Dialog
        
        void track_type_chosen ();
        void refill_channel_setups ();
+       void refill_route_groups ();
        void add_route_group (ARDOUR::RouteGroup *);
 
        void reset_template_option_visibility ();