From 13bb67a3bb6ea7d141e2b571b84495ca51b91bce Mon Sep 17 00:00:00 2001 From: Robin Gareus Date: Thu, 11 Sep 2014 02:32:36 +0200 Subject: [PATCH] fix race-condition/segfault at exit: suppress route-group-reorder signal when session is being destroyed. --- gtk2_ardour/editor_route_groups.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gtk2_ardour/editor_route_groups.cc b/gtk2_ardour/editor_route_groups.cc index d85335fd42..c7a148304b 100644 --- a/gtk2_ardour/editor_route_groups.cc +++ b/gtk2_ardour/editor_route_groups.cc @@ -197,7 +197,7 @@ EditorRouteGroups::remove_selected () Glib::RefPtr 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. */