X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fcontrol_protocol_manager.cc;h=c2929a396870a5dc1ba660812f70f97f51570832;hb=baa00942a20856cf332f547086ed5ebd2ff9078e;hp=861684846754db21c62bf9e8bc83ae8f8d840fc8;hpb=ae837b49ed8d00c484cf7e99f3485e67c94daf79;p=ardour.git

diff --git a/libs/ardour/control_protocol_manager.cc b/libs/ardour/control_protocol_manager.cc
index 8616848467..c2929a3968 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);
 	}
 
@@ -482,7 +483,9 @@ ControlProtocolManager::set_state (const XMLNode& node, int /*version*/)
 			ControlProtocolInfo* cpi = cpi_by_name (name);
 
 			if (cpi) {
+#ifndef NDEBUG
 				std::cerr << "protocol " << name << " active ? " << active << std::endl;
+#endif
 
 				if (active) {
 					delete cpi->state;