Remove several exception-throwing asserts from destructors.

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

diff --git a/src/lib/encode_server_finder.cc b/src/lib/encode_server_finder.cc
index 7491d9ef7cc3d578ffd7ecbd8be7e80d87c7fb70..eebf404fafa9604116fb8cb0831b7458c7390e43 100644 (file)
--- a/src/lib/encode_server_finder.cc
+++ b/src/lib/encode_server_finder.cc
@@ -64,14 +64,22 @@ EncodeServerFinder::~EncodeServerFinder ()
 
        _search_condition.notify_all ();
        if (_search_thread) {
-               DCPOMATIC_ASSERT (_search_thread->joinable ());
-               _search_thread->join ();
+               /* Ideally this would be a DCPOMATIC_ASSERT(_search_thread->joinable()) but we
+                  can't throw exceptions from a destructor.
+               */
+               if (_search_thread->joinable ()) {
+                       _search_thread->join ();
+               }
        }
 
        _listen_io_service.stop ();
        if (_listen_thread) {
-               DCPOMATIC_ASSERT (_listen_thread->joinable ());
-               _listen_thread->join ();
+               /* Ideally this would be a DCPOMATIC_ASSERT(_listen_thread->joinable()) but we
+                  can't throw exceptions from a destructor.
+               */
+               if (_listen_thread->joinable ()) {
+                       _listen_thread->join ();
+               }
        }
 }