Fix duplicate name of _mutex in ExceptionStore and some of its children.

4 files changed, 11 insertions, 11 deletions

diff --git a/src/lib/server_finder.cc b/src/lib/server_finder.cc
index 1727016e6..315d8d79d 100644
--- a/src/lib/server_finder.cc
+++ b/src/lib/server_finder.cc
@@ -168,7 +168,7 @@ ServerFinder::handle_accept (boost::system::error_code ec, shared_ptr<Socket> so
 	if (!server_found (ip) && xml->optional_number_child<int>("Version").get_value_or (0) == SERVER_LINK_VERSION) {
 		ServerDescription sd (ip, xml->number_child<int> ("Threads"));
 		{
-			boost::mutex::scoped_lock lm (_mutex);
+			boost::mutex::scoped_lock lm (_servers_mutex);
 			_servers.push_back (sd);
 		}
 		emit (boost::bind (boost::ref (ServersListChanged)));
@@ -180,7 +180,7 @@ ServerFinder::handle_accept (boost::system::error_code ec, shared_ptr<Socket> so
 bool
 ServerFinder::server_found (string ip) const
 {
-	boost::mutex::scoped_lock lm (_mutex);
+	boost::mutex::scoped_lock lm (_servers_mutex);
 	list<ServerDescription>::const_iterator i = _servers.begin();
 	while (i != _servers.end() && i->host_name() != ip) {
 		++i;
@@ -209,7 +209,7 @@ ServerFinder::drop ()
 list<ServerDescription>
 ServerFinder::servers () const
 {
-	boost::mutex::scoped_lock lm (_mutex);
+	boost::mutex::scoped_lock lm (_servers_mutex);
 	return _servers;
 }
 
@@ -218,7 +218,7 @@ ServerFinder::config_changed (Config::Property what)
 {
 	if (what == Config::USE_ANY_SERVERS || what == Config::SERVERS) {
 		{
-			boost::mutex::scoped_lock lm (_mutex);
+			boost::mutex::scoped_lock lm (_servers_mutex);
 			_servers.clear ();
 		}
 		ServersListChanged ();
diff --git a/src/lib/server_finder.h b/src/lib/server_finder.h
index bd6d79304..76926916d 100644
--- a/src/lib/server_finder.h
+++ b/src/lib/server_finder.h
@@ -67,7 +67,7 @@ private:
 	boost::thread* _listen_thread;
 
 	std::list<ServerDescription> _servers;
-	mutable boost::mutex _mutex;
+	mutable boost::mutex _servers_mutex;
 
 	boost::asio::io_service _listen_io_service;
 	boost::shared_ptr<boost::asio::ip::tcp::acceptor> _listen_acceptor;
diff --git a/src/lib/writer.cc b/src/lib/writer.cc
index 2571ce3cb..58b2b8a91 100644
--- a/src/lib/writer.cc
+++ b/src/lib/writer.cc
@@ -160,7 +160,7 @@ Writer::~Writer ()
 void
 Writer::write (Data encoded, int frame, Eyes eyes)
 {
-	boost::mutex::scoped_lock lock (_mutex);
+	boost::mutex::scoped_lock lock (_state_mutex);
 
 	while (_queued_full_in_memory > _maximum_frames_in_memory) {
 		/* The queue is too big; wait until that is sorted out */
@@ -193,7 +193,7 @@ Writer::write (Data encoded, int frame, Eyes eyes)
 void
 Writer::repeat (int frame, Eyes eyes)
 {
-	boost::mutex::scoped_lock lock (_mutex);
+	boost::mutex::scoped_lock lock (_state_mutex);
 
 	while (_queued_full_in_memory > _maximum_frames_in_memory) {
 		/* The queue is too big; wait until that is sorted out */
@@ -220,7 +220,7 @@ Writer::repeat (int frame, Eyes eyes)
 void
 Writer::fake_write (int frame, Eyes eyes)
 {
-	boost::mutex::scoped_lock lock (_mutex);
+	boost::mutex::scoped_lock lock (_state_mutex);
 
 	while (_queued_full_in_memory > _maximum_frames_in_memory) {
 		/* The queue is too big; wait until that is sorted out */
@@ -316,7 +316,7 @@ try
 {
 	while (true)
 	{
-		boost::mutex::scoped_lock lock (_mutex);
+		boost::mutex::scoped_lock lock (_state_mutex);
 
 		while (true) {
 
@@ -459,7 +459,7 @@ catch (...)
 void
 Writer::terminate_thread (bool can_throw)
 {
-	boost::mutex::scoped_lock lock (_mutex);
+	boost::mutex::scoped_lock lock (_state_mutex);
 	if (_thread == 0) {
 		return;
 	}
diff --git a/src/lib/writer.h b/src/lib/writer.h
index 79322bacd..be1d3f69e 100644
--- a/src/lib/writer.h
+++ b/src/lib/writer.h
@@ -135,7 +135,7 @@ private:
 	/** number of FULL frames whose JPEG200 data is currently held in RAM */
 	int _queued_full_in_memory;
 	/** mutex for thread state */
-	mutable boost::mutex _mutex;
+	mutable boost::mutex _state_mutex;
 	/** condition to manage thread wakeups when we have nothing to do  */
 	boost::condition _empty_condition;
 	/** condition to manage thread wakeups when we have too much to do */