update selection clock

[ardour.git] / gtk2_ardour / editor_route_groups.cc

diff --git a/gtk2_ardour/editor_route_groups.cc b/gtk2_ardour/editor_route_groups.cc
index d85335fd421a749aa9b3cd5d1e22a296ba4bba96..dbf717308292d3cbbd2253027004ccf6ac6a4ed8 100644 (file)
--- a/gtk2_ardour/editor_route_groups.cc
+++ b/gtk2_ardour/editor_route_groups.cc
@@ -197,7 +197,7 @@ EditorRouteGroups::remove_selected ()
        Glib::RefPtr<TreeSelection> selection = _display.get_selection();
        TreeView::Selection::ListHandle_Path rows = selection->get_selected_rows ();
 
-       if (rows.empty()) {
+       if (rows.empty() || _session->deletion_in_progress()) {
                return;
        }
 
@@ -272,7 +272,6 @@ EditorRouteGroups::button_press_event (GdkEventButton* ev)
                case RESPONSE_ACCEPT:
                        c = color_dialog.get_colorsel()->get_current_color();
                        GroupTabs::set_group_color (group, gdk_color_to_rgba (c));
-                       ARDOUR_UI::config()->set_dirty ();
                        break;
                        
                default:
@@ -473,6 +472,7 @@ EditorRouteGroups::groups_changed ()
 void
 EditorRouteGroups::property_changed (RouteGroup* group, const PropertyChange&)
 {
+       assert(group);
        _in_row_change = true;
 
        Gtk::TreeModel::Children children = _model->children();
@@ -582,7 +582,7 @@ EditorRouteGroups::run_new_group_dialog ()
 void
 EditorRouteGroups::row_deleted (Gtk::TreeModel::Path const &)
 {
-       if (_in_rebuild) {
+       if (_in_rebuild || !_session || _session->deletion_in_progress()) {
                /* We need to ignore this in cases where we're not doing a drag-and-drop
                   re-order.
                */