X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fupdate_checker.cc;h=8aeca030bf79f8ba4a7a599ebcce4bf1e11bda88;hb=931b81e323c41a05b5f5612350ebc42ff20e97cb;hp=e3bbd663ee254af8abbc68fabf71774edb2141f6;hpb=3828baf56467224f5d44049bf1e7a7ed11f43a05;p=dcpomatic.git

diff --git a/src/lib/update_checker.cc b/src/lib/update_checker.cc
index e3bbd663e..8aeca030b 100644
--- a/src/lib/update_checker.cc
+++ b/src/lib/update_checker.cc
@@ -20,9 +20,8 @@
 
 #include "update_checker.h"
 #include "version.h"
-#include "safe_stringstream.h"
 #include "util.h"
-#include "raw_convert.h"
+#include <dcp/raw_convert.h>
 #include <libcxml/cxml.h>
 #include <curl/curl.h>
 #include <boost/algorithm/string.hpp>
@@ -37,6 +36,7 @@ using std::string;
 using std::vector;
 using boost::is_any_of;
 using boost::ends_with;
+using dcp::raw_convert;
 
 /** Singleton instance */
 UpdateChecker* UpdateChecker::_instance = 0;
@@ -86,8 +86,12 @@ UpdateChecker::~UpdateChecker ()
 
 	_condition.notify_all ();
 	if (_thread) {
-		DCPOMATIC_ASSERT (_thread->joinable ());
-		_thread->join ();
+		/* Ideally this would be a DCPOMATIC_ASSERT(_thread->joinable()) but we
+		   can't throw exceptions from a destructor.
+		*/
+		if (_thread->joinable ()) {
+			_thread->join ();
+		}
 	}
 	delete _thread;