X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fencode_server_finder.cc;h=135a8bce8219539f676e37f18b3e05079f38b46c;hb=57d00c880094b1dfebaee18f4ecafb1dd44b0afb;hp=eebf404fafa9604116fb8cb0831b7458c7390e43;hpb=8862cbbb7e857c90d405069ad7d41a8d58029194;p=dcpomatic.git

diff --git a/src/lib/encode_server_finder.cc b/src/lib/encode_server_finder.cc
index eebf404fa..135a8bce8 100644
--- a/src/lib/encode_server_finder.cc
+++ b/src/lib/encode_server_finder.cc
@@ -43,8 +43,7 @@ using boost::weak_ptr;
 EncodeServerFinder* EncodeServerFinder::_instance = 0;
 
 EncodeServerFinder::EncodeServerFinder ()
-	: _disabled (false)
-	, _search_thread (0)
+	: _search_thread (0)
 	, _listen_thread (0)
 	, _stop (false)
 {
@@ -58,7 +57,14 @@ EncodeServerFinder::start ()
 	_listen_thread = new boost::thread (boost::bind (&EncodeServerFinder::listen_thread, this));
 }
 
+
 EncodeServerFinder::~EncodeServerFinder ()
+{
+	stop ();
+}
+
+void
+EncodeServerFinder::stop ()
 {
 	_stop = true;
 
@@ -71,6 +77,8 @@ EncodeServerFinder::~EncodeServerFinder ()
 			_search_thread->join ();
 		}
 	}
+	delete _search_thread;
+	_search_thread = 0;
 
 	_listen_io_service.stop ();
 	if (_listen_thread) {
@@ -81,6 +89,11 @@ EncodeServerFinder::~EncodeServerFinder ()
 			_listen_thread->join ();
 		}
 	}
+	delete _listen_thread;
+	_listen_thread = 0;
+
+	boost::mutex::scoped_lock lm (_servers_mutex);
+	_servers.clear ();
 }
 
 void