All included libraries now link dynamically instead of statically.

Moved items from gtk2_ardour/utils to pbd3/convert.
Various cleanups.


git-svn-id: svn://localhost/trunk/ardour2@475 d708f5d6-7413-0410-9779-e7cbd77b26cf

1 files changed, 12 insertions, 12 deletions

diff --git a/libs/ardour/control_protocol_manager.cc b/libs/ardour/control_protocol_manager.cc
index ed33d0b6ee..6f3cb4e457 100644
--- a/libs/ardour/control_protocol_manager.cc
+++ b/libs/ardour/control_protocol_manager.cc
@@ -231,22 +231,22 @@ ControlProtocolManager::set_state (const XMLNode& node)
 
 	for (citer = clist.begin(); citer != clist.end(); ++citer) {
 		if ((*citer)->name() == X_("Protocol")) {
-			if ((prop = (*citer)->property (X_("active"))) != 0) {
-				if (prop->value() == X_("yes")) {
-					if ((prop = (*citer)->property (X_("name"))) != 0) {
-						ControlProtocolInfo* cpi = cpi_by_name (prop->value());
-						if (cpi) {
-							if (_session) {
-								instantiate (*cpi);
-							} else {
-								cpi->requested = true;
-							}
+			prop = (*citer)->property (X_("active"));
+			if (prop && prop->value() == X_("yes")) {
+				if ((prop = (*citer)->property (X_("name"))) != 0) {
+					ControlProtocolInfo* cpi = cpi_by_name (prop->value());
+					if (cpi) {
+						if (_session) {
+							instantiate (*cpi);
+						} else {
+							cpi->requested = true;
 						}
 					}
 				}
-			}    
-		}
+			}
+		}    
 	}
+	return 0;
 }
 
 XMLNode&