From: Carl Hetherington <cth@carlh.net>
Date: Sat, 23 May 2015 16:40:03 +0000 (+0100)
Subject: Rename mutex to avoid confusion.
X-Git-Tag: v2.0.48~73
X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=commitdiff_plain;h=d5b1891594278bc6f609f9acc06b200a98103fd8

Rename mutex to avoid confusion.
---

diff --git a/src/lib/signaller.h b/src/lib/signaller.h
index 4ef9b38b3..661a171ec 100644
--- a/src/lib/signaller.h
+++ b/src/lib/signaller.h
@@ -89,7 +89,7 @@ class Signaller
 public:
 	/* Can be called from any thread */
 	virtual ~Signaller () {
-		boost::mutex::scoped_lock lm (_mutex);
+		boost::mutex::scoped_lock lm (_signaller_mutex);
 		for (std::list<WrapperBase*>::iterator i = _wrappers.begin(); i != _wrappers.end(); ++i) {
 			(*i)->invalidate ();
 		}
@@ -104,7 +104,7 @@ public:
 			signal_manager->emit (boost::bind (&Wrapper<T>::signal, w));
 		}
 		
-		boost::mutex::scoped_lock lm (_mutex);
+		boost::mutex::scoped_lock lm (_signaller_mutex);
 
 		/* Clean up finished Wrappers */
 		std::list<WrapperBase*>::iterator i = _wrappers.begin ();
@@ -124,7 +124,7 @@ public:
 
 private:
 	/* Protect _wrappers */
-	boost::mutex _mutex;
+	boost::mutex _signaller_mutex;
 	std::list<WrapperBase*> _wrappers;
 };