merge 2.0-ongoing into 3.0 @ 3581 - 3710

git-svn-id: svn://localhost/ardour2/branches/3.0@3712 d708f5d6-7413-0410-9779-e7cbd77b26cf

2 files changed, 5 insertions, 5 deletions

diff --git a/libs/pbd/pbd/xml++.h b/libs/pbd/pbd/xml++.h
index 290a449869..83cc8ff91b 100644
--- a/libs/pbd/pbd/xml++.h
+++ b/libs/pbd/pbd/xml++.h
@@ -78,6 +78,7 @@ private:
   XMLNodeList _children;
   XMLPropertyList _proplist;
   XMLPropertyMap _propmap;
+  mutable XMLNodeList _selected_children;
 
 public:
   XMLNode(const string& name);
diff --git a/libs/pbd/xml++.cc b/libs/pbd/xml++.cc
index ec1ca5d2b9..9643b5d3a8 100644
--- a/libs/pbd/xml++.cc
+++ b/libs/pbd/xml++.cc
@@ -278,22 +278,21 @@ XMLNode::children(const string& n) const
 {
 	/* returns all children matching name */
 
-	static XMLNodeList retval;
 	XMLNodeConstIterator cur;
 	
 	if (n.empty()) {
 		return _children;
 	}
-		
-	retval.erase(retval.begin(), retval.end());
+
+	_selected_children.clear();
 	
 	for (cur = _children.begin(); cur != _children.end(); ++cur) {
 		if ((*cur)->name() == n) {
-			retval.insert(retval.end(), *cur);
+			_selected_children.insert(_selected_children.end(), *cur);
 		}
 	}
 		
-	return retval;
+	return _selected_children;
 }
 
 XMLNode *