Extend maximum DCP audio channels to 16.

[dcpomatic.git] / src / lib / server_finder.cc

diff --git a/src/lib/server_finder.cc b/src/lib/server_finder.cc
index 4b532f98129d4f70386040d9dfc182761973312f..8685c830f2a9d349075ef639190c523f17da68b3 100644 (file)
--- a/src/lib/server_finder.cc
+++ b/src/lib/server_finder.cc
@@ -63,11 +63,13 @@ ServerFinder::~ServerFinder ()
 
        _search_condition.notify_all ();
        if (_search_thread) {
+               DCPOMATIC_ASSERT (_search_thread->joinable ());
                _search_thread->join ();
        }
 
        _listen_io_service.stop ();
        if (_listen_thread) {
+               DCPOMATIC_ASSERT (_listen_thread->joinable ());
                _listen_thread->join ();
        }
 }
@@ -233,12 +235,6 @@ ServerFinder::config_changed (Config::Property what)
                        _servers.clear ();
                }
                ServersListChanged ();
-               search_now ();
+               _search_condition.notify_all ();
        }
 }
-
-void
-ServerFinder::search_now ()
-{
-       _search_condition.notify_all ();
-}