diff options
| author | Carl Hetherington <cth@carlh.net> | 2016-07-03 20:36:20 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2016-07-03 20:36:20 +0100 |
| commit | 8862cbbb7e857c90d405069ad7d41a8d58029194 (patch) | |
| tree | ebce1a0209f05784f96321be82236d28b647e37a /src/lib/update_checker.cc | |
| parent | a4c5a9ff48c4cec51e3488f4f8692bf2a2f82dca (diff) | |
Remove several exception-throwing asserts from destructors.
Diffstat (limited to 'src/lib/update_checker.cc')
| -rw-r--r-- | src/lib/update_checker.cc | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/lib/update_checker.cc b/src/lib/update_checker.cc index e3bbd663e..58bc7c1b7 100644 --- a/src/lib/update_checker.cc +++ b/src/lib/update_checker.cc @@ -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; |