X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Fupdate_checker.cc;h=82337f92016905420316ad19daa1d1779804ffcf;hp=8aeca030bf79f8ba4a7a599ebcce4bf1e11bda88;hb=8f12e84009d7c2685bb2eeb32665876463d4e6e5;hpb=73654117144c6de0ec4efe39ddc88485df546cc9

diff --git a/src/lib/update_checker.cc b/src/lib/update_checker.cc
index 8aeca030b..82337f920 100644
--- a/src/lib/update_checker.cc
+++ b/src/lib/update_checker.cc
@@ -56,13 +56,12 @@ UpdateChecker::UpdateChecker ()
 	, _curl (0)
 	, _state (NOT_RUN)
 	, _emits (0)
-	, _thread (0)
 	, _to_do (0)
 	, _terminate (false)
 {
 	_curl = curl_easy_init ();
 
-	curl_easy_setopt (_curl, CURLOPT_URL, "http://dcpomatic.com/update");
+	curl_easy_setopt (_curl, CURLOPT_URL, "https://dcpomatic.com/update");
 	curl_easy_setopt (_curl, CURLOPT_WRITEFUNCTION, write_callback_wrapper);
 	curl_easy_setopt (_curl, CURLOPT_WRITEDATA, this);
 	curl_easy_setopt (_curl, CURLOPT_TIMEOUT, 20);
@@ -74,7 +73,10 @@ UpdateChecker::UpdateChecker ()
 void
 UpdateChecker::start ()
 {
-	_thread = new boost::thread (boost::bind (&UpdateChecker::thread, this));
+	_thread = boost::thread (boost::bind (&UpdateChecker::thread, this));
+#ifdef DCPOMATIC_LINUX
+	pthread_setname_np (_thread.native_handle(), "update-checker");
+#endif
 }
 
 UpdateChecker::~UpdateChecker ()
@@ -85,15 +87,13 @@ UpdateChecker::~UpdateChecker ()
 	}
 
 	_condition.notify_all ();
-	if (_thread) {
-		/* Ideally this would be a DCPOMATIC_ASSERT(_thread->joinable()) but we
-		   can't throw exceptions from a destructor.
-		*/
-		if (_thread->joinable ()) {
-			_thread->join ();
+	if (_thread.joinable()) {
+		try {
+			_thread.join ();
+		} catch (...) {
+
 		}
 	}
-	delete _thread;
 
 	curl_easy_cleanup (_curl);
 	delete[] _buffer;
@@ -158,7 +158,7 @@ UpdateChecker::thread ()
 				_stable = stable;
 			}
 
-			if (version_less_than (dcpomatic_version, test)) {
+			if (!test.empty() && version_less_than (dcpomatic_version, test)) {
 				_test = test;
 			}