summaryrefslogtreecommitdiff
path: root/src/lib
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2015-11-14 18:27:25 +0000
committerCarl Hetherington <cth@carlh.net>2015-11-14 18:27:54 +0000
commitf4e6a36244b0838d4f28d44e09d983686d1bd597 (patch)
treee4f98678c0d7ad1a1c1bb966263072ecb89a56b2 /src/lib
parentb25fb46d830ec091fefd473a1bfe52b527a43eee (diff)
Fix various misbehaviours with update checking (#749).
Diffstat (limited to 'src/lib')
-rw-r--r--src/lib/update_checker.cc3
-rw-r--r--src/lib/update_checker.h8
2 files changed, 2 insertions, 9 deletions
diff --git a/src/lib/update_checker.cc b/src/lib/update_checker.cc
index 4c5075e20..31ea9a4fd 100644
--- a/src/lib/update_checker.cc
+++ b/src/lib/update_checker.cc
@@ -20,7 +20,6 @@
#include "update_checker.h"
#include "version.h"
#include "safe_stringstream.h"
-#include "config.h"
#include "util.h"
#include "raw_convert.h"
#include <libcxml/cxml.h>
@@ -154,7 +153,7 @@ UpdateChecker::thread ()
_stable = stable;
}
- if (Config::instance()->check_for_test_updates() && version_less_than (dcpomatic_version, test)) {
+ if (version_less_than (dcpomatic_version, test)) {
_test = test;
}
diff --git a/src/lib/update_checker.h b/src/lib/update_checker.h
index b0eb62273..ff1999810 100644
--- a/src/lib/update_checker.h
+++ b/src/lib/update_checker.h
@@ -57,18 +57,12 @@ public:
return _stable;
}
- /** @return new test version, if there is one and Config is set to look for it */
+ /** @return new test version, if there is one */
boost::optional<std::string> test () {
boost::mutex::scoped_lock lm (_data_mutex);
return _test;
}
- /** @return true if the last signal emission was the first */
- bool last_emit_was_first () const {
- boost::mutex::scoped_lock lm (_data_mutex);
- return _emits == 1;
- }
-
size_t write_callback (void *, size_t, size_t);
boost::signals2::signal<void (void)> StateChanged;