diff options
| author | Carl Hetherington <cth@carlh.net> | 2015-11-30 11:50:40 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2015-11-30 11:50:40 +0000 |
| commit | 82fef2120c35c4ecaa13cab1f45f0bd0b041eecd (patch) | |
| tree | 5c295734ae5bb0ac512cab0ecffffa8e9cc8ed84 /src | |
| parent | d34640bcfaf66601dbff5b94f1a0d5ad4ec72fa0 (diff) | |
I think it's ok and less crash-prone to check joinable() rather
than asserting it; I have seen traces which suggest the assert
might be triggering. In an ideal world we would track down
why that's happening.
Diffstat (limited to 'src')
| -rw-r--r-- | src/lib/writer.cc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/lib/writer.cc b/src/lib/writer.cc index 17bd21daf..7381d2a90 100644 --- a/src/lib/writer.cc +++ b/src/lib/writer.cc @@ -429,8 +429,10 @@ Writer::terminate_thread (bool can_throw) _full_condition.notify_all (); lock.unlock (); - DCPOMATIC_ASSERT (_thread->joinable ()); - _thread->join (); + if (_thread->joinable ()) { + _thread->join (); + } + if (can_throw) { rethrow (); } |
