X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fupdate_checker.cc;h=98e4078225d36f8619d4d34cd2e2fa3c3f24d639;hb=697d21c3f9bc6243151372f988936662b9993510;hp=4c5075e20f3d81a1e298cf0f914e3434fd616497;hpb=267e21bfb78593bcb87eb24ce01b88d0859566f7;p=dcpomatic.git

diff --git a/src/lib/update_checker.cc b/src/lib/update_checker.cc
index 4c5075e20..98e407822 100644
--- a/src/lib/update_checker.cc
+++ b/src/lib/update_checker.cc
@@ -1,28 +1,27 @@
 /*
     Copyright (C) 2014-2015 Carl Hetherington <cth@carlh.net>
 
-    This program is free software; you can redistribute it and/or modify
+    This file is part of DCP-o-matic.
+
+    DCP-o-matic is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation; either version 2 of the License, or
     (at your option) any later version.
 
-    This program is distributed in the hope that it will be useful,
+    DCP-o-matic is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+    along with DCP-o-matic.  If not, see <http://www.gnu.org/licenses/>.
 
 */
 
 #include "update_checker.h"
 #include "version.h"
-#include "safe_stringstream.h"
-#include "config.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;
@@ -62,7 +62,7 @@ UpdateChecker::UpdateChecker ()
 {
 	_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);
@@ -75,6 +75,9 @@ void
 UpdateChecker::start ()
 {
 	_thread = new boost::thread (boost::bind (&UpdateChecker::thread, this));
+#ifdef DCPOMATIC_LINUX
+	pthread_setname_np (_thread->native_handle(), "update-checker");
+#endif
 }
 
 UpdateChecker::~UpdateChecker ()
@@ -86,8 +89,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;
 
@@ -154,7 +161,7 @@ UpdateChecker::thread ()
 				_stable = stable;
 			}
 
-			if (Config::instance()->check_for_test_updates() && version_less_than (dcpomatic_version, test)) {
+			if (!test.empty() && version_less_than (dcpomatic_version, test)) {
 				_test = test;
 			}