fix race-condition/segfault at exit:
authorRobin Gareus <robin@gareus.org>
Thu, 11 Sep 2014 00:32:36 +0000 (02:32 +0200)
committerRobin Gareus <robin@gareus.org>
Thu, 11 Sep 2014 01:04:11 +0000 (03:04 +0200)
suppress route-group-reorder signal when
session is being destroyed.

gtk2_ardour/editor_route_groups.cc

index d85335fd421a749aa9b3cd5d1e22a296ba4bba96..c7a148304b2da1a62d0259ed22b4c9c88d311e56 100644 (file)
@@ -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;
        }
 
@@ -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.
                */