projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove debug code; fixes #1133.
[dcpomatic.git]
/
src
/
lib
/
update_checker.cc
diff --git
a/src/lib/update_checker.cc
b/src/lib/update_checker.cc
index e3bbd663ee254af8abbc68fabf71774edb2141f6..8aeca030bf79f8ba4a7a599ebcce4bf1e11bda88 100644
(file)
--- a/
src/lib/update_checker.cc
+++ b/
src/lib/update_checker.cc
@@
-20,9
+20,8
@@
#include "update_checker.h"
#include "version.h"
#include "update_checker.h"
#include "version.h"
-#include "safe_stringstream.h"
#include "util.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>
#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 std::vector;
using boost::is_any_of;
using boost::ends_with;
+using dcp::raw_convert;
/** Singleton instance */
UpdateChecker* UpdateChecker::_instance = 0;
/** Singleton instance */
UpdateChecker* UpdateChecker::_instance = 0;
@@
-86,8
+86,12
@@
UpdateChecker::~UpdateChecker ()
_condition.notify_all ();
if (_thread) {
_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;
}
delete _thread;