From d0c934a9de31df9ea0f6046fa074ea9fe17e8b07 Mon Sep 17 00:00:00 2001
From: Robin Gareus <robin@gareus.org>
Date: Thu, 3 Aug 2017 18:43:12 +0200
Subject: Fix crash when cleaning up w/o destroying session

- Control-protocols may transmit data during cleanup
 (e.g. reset surface), and need the Audio-engine to do so.
- destroying the ControlProtocolManager w/o the Session calling
 ::drop_protocols(), lead to a double free.
---
 libs/ardour/globals.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'libs/ardour/globals.cc')

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
-- 
cgit v1.2.3