From 8dc41bb7002d04aab21d551db8a1f48b43d36980 Mon Sep 17 00:00:00 2001
From: Robin Gareus <robin@gareus.org>
Date: Mon, 27 Oct 2014 21:15:39 +0100
Subject: fix potential crash at session close (when port-matrix is visible)

remove_aux_or_listen() -> PortMatrix::route_processors_changed()
-> setup_global_ports() -> PortGroupList::gather() -> crash
if some session ports were already removed.
---
 gtk2_ardour/port_matrix.cc | 1 +
 1 file changed, 1 insertion(+)

(limited to 'gtk2_ardour/port_matrix.cc')

diff --git a/gtk2_ardour/port_matrix.cc b/gtk2_ardour/port_matrix.cc
index 9a22ed97e6..bf9da544e6 100644
--- a/gtk2_ardour/port_matrix.cc
+++ b/gtk2_ardour/port_matrix.cc
@@ -610,6 +610,7 @@ PortMatrix::disassociate_all_on_channel (boost::weak_ptr<Bundle> bundle, uint32_
 void
 PortMatrix::setup_global_ports ()
 {
+	if (!_session || _session->deletion_in_progress()) return;
 	ENSURE_GUI_THREAD (*this, &PortMatrix::setup_global_ports)
 
 	for (int i = 0; i < 2; ++i) {
-- 
cgit v1.2.3