copy contents of analysis, plugins, automation and externals folders during save-as

[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 377e58ccf8f986c9e4a972e2e5a2915c607a2c2d..64dc1e414b876d3e497ae47580c19362735bf355 100644 (file)
--- a/gtk2_ardour/editor_route_groups.cc
+++ b/gtk2_ardour/editor_route_groups.cc
@@ -93,18 +93,18 @@ EditorRouteGroups::EditorRouteGroups (Editor* e)
        Gtk::Label* l;
 
        ColumnInfo ci[] = {
-               { 0, _("Col"), _("Group Tab Color") },
-               { 1, _("Name"), _("Name of Group") },
-               { 2, _("V"), _("Group is visible?") },
-               { 3, _("On"), _("Group is enabled?") },
-               { 4, S_("group|G"), _("Sharing Gain?") },
-               { 5, S_("relative|Rel"), _("Relative Gain Changes?") },
-               { 6, S_("mute|M"), _("Sharing Mute?") },
-               { 7, S_("solo|S"), _("Sharing Solo?") },
-               { 8, _("Rec"), _("Sharing Record-enable Status?") },
-               { 9, S_("monitoring|Mon"), _("Sharing Monitoring Choice?") },
-               { 10, S_("selection|Sel"), _("Sharing Selected/Editing Status?") },
-               { 11, S_("active|A"), _("Sharing Active Status?") },
+               { 0,   _("Col"),            _("Group Tab Color") },
+               { 1,   _("Name"),           _("Name of Group") },
+               { 2,  S_("Visible|V"),      _("Group is visible?") },
+               { 3,   _("On"),             _("Group is enabled?") },
+               { 4,  S_("Group|G"),        _("Sharing Gain?") },
+               { 5,  S_("Relative|Rel"),   _("Relative Gain Changes?") },
+               { 6,  S_("Mute|M"),         _("Sharing Mute?") },
+               { 7,  S_("Solo|S"),         _("Sharing Solo?") },
+               { 8,   _("Rec"),            _("Sharing Record-enable Status?") },
+               { 9,  S_("Monitoring|Mon"), _("Sharing Monitoring Choice?") },
+               { 10, S_("Selection|Sel"),  _("Sharing Selected/Editing Status?") },
+               { 11, S_("Active|A"),       _("Sharing Active Status?") },
                { -1, 0, 0 }
        };
 
@@ -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();
@@ -551,8 +551,6 @@ EditorRouteGroups::set_session (Session* s)
 
        if (_session) {
 
-               RouteGroup& arg (_session->all_route_group());
-
                _session->route_group_added.connect (_session_connections, MISSING_INVALIDATOR, boost::bind (&EditorRouteGroups::add, this, _1), gui_context());
                _session->route_group_removed.connect (
                        _session_connections, MISSING_INVALIDATOR, boost::bind (&EditorRouteGroups::groups_changed, this), gui_context()
@@ -584,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.
                */