X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=libs%2Fardour%2Fcontrol_protocol_manager.cc;h=9f6216062adb6a54bdf3758db5d84577a7cdf68e;hb=225a8a47a419e5e67a27b604bfd912498e3ad2cc;hp=7423d3b5c6a4c82ac464b1fd2d4b26c56d254369;hpb=b5ed8495fb5363d44f52c0090ea78f87a5d55e8b;p=ardour.git

diff --git a/libs/ardour/control_protocol_manager.cc b/libs/ardour/control_protocol_manager.cc
index 7423d3b5c6..9f6216062a 100644
--- a/libs/ardour/control_protocol_manager.cc
+++ b/libs/ardour/control_protocol_manager.cc
@@ -168,7 +168,7 @@ ControlProtocolManager::instantiate (ControlProtocolInfo& cpi)
 
 	cpi.descriptor = get_descriptor (cpi.path);
 
- 	DEBUG_TRACE (DEBUG::ControlProtocols, string_compose ("instantiating %1\n", cpi.name));
+	DEBUG_TRACE (DEBUG::ControlProtocols, string_compose ("instantiating %1\n", cpi.name));
 
 	if (cpi.descriptor == 0) {
 		error << string_compose (_("control protocol name \"%1\" has no descriptor"), cpi.name) << endmsg;
@@ -410,22 +410,24 @@ ControlProtocolManager::set_state (const XMLNode& node, int /*version*/)
 {
 	XMLNodeList clist;
 	XMLNodeConstIterator citer;
-	XMLProperty* prop;
+	XMLProperty const * prop;
 
 	Glib::Threads::Mutex::Lock lm (protocols_lock);
 
 	clist = node.children();
 
 	for (citer = clist.begin(); citer != clist.end(); ++citer) {
-		if ((*citer)->name() == X_("Protocol")) {
+		XMLNode const * child = *citer;
 
-			if ((prop = (*citer)->property (X_("active"))) == 0) {
+		if (child->name() == X_("Protocol")) {
+
+			if ((prop = child->property (X_("active"))) == 0) {
 				continue;
 			}
 
 			bool active = string_is_affirmative (prop->value());
 
-			if ((prop = (*citer)->property (X_("name"))) == 0) {
+			if ((prop = child->property (X_("name"))) == 0) {
 				continue;
 			}