From: Robin Gareus <robin@gareus.org>
Date: Thu, 26 May 2016 13:05:06 +0000 (+0200)
Subject: take read-lock when saving processor order
X-Git-Tag: 5.0-pre0~569
X-Git-Url: https://main.carlh.net/gitweb/?p=ardour.git;a=commitdiff_plain;h=00967a19829cc6aab30eefecdd1deef29c7c9d33

take read-lock when saving processor order
---

diff --git a/libs/ardour/route.cc b/libs/ardour/route.cc
index 3442d0ec8a..6cd593d5ad 100644
--- a/libs/ardour/route.cc
+++ b/libs/ardour/route.cc
@@ -2781,26 +2781,29 @@ Route::state(bool full_state)
 		node->add_child_nocopy (_pannable->state (full_state));
 	}
 
-	for (i = _processors.begin(); i != _processors.end(); ++i) {
-		if (!full_state) {
-			/* template save: do not include internal sends functioning as
-			   aux sends because the chance of the target ID
-			   in the session where this template is used
-			   is not very likely.
-
-			   similarly, do not save listen sends which connect to
-			   the monitor section, because these will always be
-			   added if necessary.
-			*/
-			boost::shared_ptr<InternalSend> is;
+	{
+		Glib::Threads::RWLock::ReaderLock lm (_processor_lock);
+		for (i = _processors.begin(); i != _processors.end(); ++i) {
+			if (!full_state) {
+				/* template save: do not include internal sends functioning as
+					 aux sends because the chance of the target ID
+					 in the session where this template is used
+					 is not very likely.
+
+					 similarly, do not save listen sends which connect to
+					 the monitor section, because these will always be
+					 added if necessary.
+					 */
+				boost::shared_ptr<InternalSend> is;
 
-			if ((is = boost::dynamic_pointer_cast<InternalSend> (*i)) != 0) {
-				if (is->role() == Delivery::Listen) {
-					continue;
+				if ((is = boost::dynamic_pointer_cast<InternalSend> (*i)) != 0) {
+					if (is->role() == Delivery::Listen) {
+						continue;
+					}
 				}
 			}
+			node->add_child_nocopy((*i)->state (full_state));
 		}
-		node->add_child_nocopy((*i)->state (full_state));
 	}
 
 	if (_extra_xml) {