summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarl Hetherington <carl@carlh.net>2010-09-09 14:41:09 +0000
committerCarl Hetherington <carl@carlh.net>2010-09-09 14:41:09 +0000
commit14f67ab1874b376cb2bceb8fe7cc27ee3ac50976 (patch)
tree5f0c115f528a68f525e4891c09806cb39961ee74
parentd02822e78890250b9d5d673d1b2b2ad700b07350 (diff)
Patch from Lincoln to fix placement of plugins in 2.X sessions. Fixes #3444.
git-svn-id: svn://localhost/ardour2/branches/3.0@7762 d708f5d6-7413-0410-9779-e7cbd77b26cf
-rw-r--r--libs/ardour/route.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/libs/ardour/route.cc b/libs/ardour/route.cc
index 9369cf887b..9ad36b90fd 100644
--- a/libs/ardour/route.cc
+++ b/libs/ardour/route.cc
@@ -931,6 +931,7 @@ Route::add_processor_from_xml_2X (const XMLNode& node, int version)
XMLNodeList const & children = node.children ();
XMLNodeList::const_iterator i = children.begin ();
+
while (i != children.end() && (*i)->name() != X_("Redirect")) {
++i;
}
@@ -938,7 +939,7 @@ Route::add_processor_from_xml_2X (const XMLNode& node, int version)
Placement placement = PreFader;
if (i != children.end()) {
- if ((prop = node.property (X_("placement"))) != 0) {
+ if ((prop = (*i)->property (X_("placement"))) != 0) {
placement = Placement (string_2_enum (prop->value(), placement));
}
}