add check for descriptor when deciding whether to register a control surface request buffer factory

1 files changed, 6 insertions, 0 deletions

diff --git a/libs/ardour/control_protocol_manager.cc b/libs/ardour/control_protocol_manager.cc
index 6583869fed..8f2f026d55 100644
--- a/libs/ardour/control_protocol_manager.cc
+++ b/libs/ardour/control_protocol_manager.cc
@@ -495,6 +495,12 @@ ControlProtocolManager::register_request_buffer_factories ()
 	Glib::Threads::Mutex::Lock lm (protocols_lock);
 
 	for (list<ControlProtocolInfo*>::iterator i = control_protocol_info.begin(); i != control_protocol_info.end(); ++i) {
+
+		if ((*i)->descriptor == 0) {
+			warning << string_compose (_("Control protocol \"%1\" has no descriptor"), (*i)->name) << endmsg;
+			continue;
+		}
+
 		if ((*i)->descriptor->request_buffer_factory) {
 			EventLoop::register_request_buffer_factory ((*i)->descriptor->name, (*i)->descriptor->request_buffer_factory);
 		}