From 204d840c43445745942eb834c120cbeaff77809e Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Sun, 4 Nov 2012 23:41:52 +0000 Subject: a variety of fixes aimed at preventing crashes caused by the (global) port matrix (window) not really noticing that the session has gone away git-svn-id: svn://localhost/ardour2/branches/3.0@13378 d708f5d6-7413-0410-9779-e7cbd77b26cf --- gtk2_ardour/ardour_ui_dialogs.cc | 7 +++++++ gtk2_ardour/global_port_matrix.cc | 12 ++++++++++++ 2 files changed, 19 insertions(+) diff --git a/gtk2_ardour/ardour_ui_dialogs.cc b/gtk2_ardour/ardour_ui_dialogs.cc index 0116f4e842..02c72d7230 100644 --- a/gtk2_ardour/ardour_ui_dialogs.cc +++ b/gtk2_ardour/ardour_ui_dialogs.cc @@ -62,6 +62,13 @@ ARDOUR_UI::set_session (Session *s) { SessionHandlePtr::set_session (s); + for (ARDOUR::DataType::iterator i = ARDOUR::DataType::begin(); i != ARDOUR::DataType::end(); ++i) { + GlobalPortMatrixWindow* w; + if ((w = _global_port_matrix[*i]->get()) != 0) { + w->set_session (s); + } + } + if (!_session) { return; } diff --git a/gtk2_ardour/global_port_matrix.cc b/gtk2_ardour/global_port_matrix.cc index d749990463..fcd9960e43 100644 --- a/gtk2_ardour/global_port_matrix.cc +++ b/gtk2_ardour/global_port_matrix.cc @@ -42,6 +42,10 @@ GlobalPortMatrix::GlobalPortMatrix (Gtk::Window* p, Session* s, DataType t) void GlobalPortMatrix::setup_ports (int dim) { + if (!_session) { + return; + } + _ports[dim].suspend_signals (); _ports[dim].gather (_session, type(), dim == IN, false, show_only_bundles ()); _ports[dim].resume_signals (); @@ -50,6 +54,10 @@ GlobalPortMatrix::setup_ports (int dim) void GlobalPortMatrix::set_state (BundleChannel c[2], bool s) { + if (!_session) { + return; + } + Bundle::PortList const & in_ports = c[IN].bundle->channel_ports (c[IN].channel); Bundle::PortList const & out_ports = c[OUT].bundle->channel_ports (c[OUT].channel); @@ -178,6 +186,10 @@ void GlobalPortMatrixWindow::set_session (Session* s) { _port_matrix.set_session (s); + + if (!s) { + hide (); + } } string -- cgit v1.2.3