X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fsignaller.h;h=fa249078c1f1fd30609c3609a7a2776444199c0c;hb=e60bb3e51bd1508b149e6b8f6608f09b5196ae26;hp=4ef9b38b36f99a304e4cbbbdf3d6204ee02102b4;hpb=6f0a590bc3266f21ba577116219bd019e891d480;p=dcpomatic.git

diff --git a/src/lib/signaller.h b/src/lib/signaller.h
index 4ef9b38b3..fa249078c 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 ();
 		}
@@ -103,8 +103,8 @@ public:
 		if (signal_manager) {
 			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;
 };