From 1223c8d1cd988c426ea79046b7eb9f542561dcb2 Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Sun, 18 Dec 2016 00:06:44 +0000 Subject: [PATCH] move termination of auto connect thread till after control protocols are destroyed. Otherwise, control protocol ports don't actually get deleted --- libs/ardour/session.cc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libs/ardour/session.cc b/libs/ardour/session.cc index 5b9d7369b5..33cd651dcc 100644 --- a/libs/ardour/session.cc +++ b/libs/ardour/session.cc @@ -607,9 +607,6 @@ Session::destroy () _state_of_the_state = StateOfTheState (CannotSave|Deletion); - /* stop autoconnecting */ - auto_connect_thread_terminate (); - /* disconnect from any and all signals that we are connected to */ Port::PortSignalDrop (); /* EMIT SIGNAL */ @@ -621,6 +618,9 @@ Session::destroy () ControlProtocolManager::instance().drop_protocols (); + /* stop autoconnecting */ + auto_connect_thread_terminate (); + MIDI::Name::MidiPatchManager::instance().remove_search_path(session_directory().midi_patch_path()); _engine.remove_session ();