Fixed midi controllable state saving/loading

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

1 files changed, 12 insertions, 6 deletions

diff --git a/libs/ardour/route.cc b/libs/ardour/route.cc
index a322c10068..d3097dd776 100644
--- a/libs/ardour/route.cc
+++ b/libs/ardour/route.cc
@@ -1687,13 +1687,19 @@ Route::_set_state (const XMLNode& node, bool call_base)
 			_comment = cmt->content();
 
 		} else if (child->name() == X_("extra")) {
+
 			_extra_xml = new XMLNode (*child);
-		} else if (child->name() == X_("solo")) {
-			_solo_control.set_state (*child);
-			_session.add_controllable (&_solo_control);
-		} else if (child->name() == X_("mute")) {
-			_mute_control.set_state (*child);
-			_session.add_controllable (&_mute_control);
+
+		} else if (child->name() == X_("controllable") && (prop = child->property("name")) != 0) {
+			
+			if (prop->value() == "solo") {
+				_solo_control.set_state (*child);
+				_session.add_controllable (&_solo_control);
+			}
+			else if (prop->value() == "mute") {
+				_mute_control.set_state (*child);
+				_session.add_controllable (&_mute_control);
+			}
 		}
 	}