summaryrefslogtreecommitdiff
path: root/src/lib
diff options
context:
space:
mode:
Diffstat (limited to 'src/lib')
-rw-r--r--src/lib/writer.cc6
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 ();
}