summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--libs/ardour/control_protocol_manager.cc1
-rw-r--r--libs/ardour/globals.cc2
2 files changed, 2 insertions, 1 deletions
diff --git a/libs/ardour/control_protocol_manager.cc b/libs/ardour/control_protocol_manager.cc
index 8616848467..bd5b7e72a6 100644
--- a/libs/ardour/control_protocol_manager.cc
+++ b/libs/ardour/control_protocol_manager.cc
@@ -76,6 +76,7 @@ ControlProtocolManager::~ControlProtocolManager()
for (list<ControlProtocolInfo*>::iterator p = control_protocol_info.begin(); p != control_protocol_info.end(); ++p) {
+ (*p)->protocol = 0; // protocol was already destroyed above.
delete (*p);
}
diff --git a/libs/ardour/globals.cc b/libs/ardour/globals.cc
index 28eb818921..00d448985f 100644
--- a/libs/ardour/globals.cc
+++ b/libs/ardour/globals.cc
@@ -597,13 +597,13 @@ ARDOUR::cleanup ()
return;
}
+ delete &ControlProtocolManager::instance();
ARDOUR::AudioEngine::destroy ();
delete Library;
#ifdef HAVE_LRDF
lrdf_cleanup ();
#endif
- delete &ControlProtocolManager::instance();
#ifdef WINDOWS_VST_SUPPORT
fst_exit ();
#endif