From 41737ca62d65bcd6c25ec1080c0c7e0e6e6ae9b2 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Mon, 20 Jun 2016 17:15:07 +0100 Subject: [PATCH 1/1] Fix encoder thread interruption. When an encoder thread is interrupted we just want it silently to stop, so catch boost::thread_interrupted separately and don't pass it on. I believe the interruption of jobs and subsequent catch of boost::thread_interrupted will still work as that's the job thread rather than the encoder threads. --- src/lib/encoder.cc | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/lib/encoder.cc b/src/lib/encoder.cc index 9ec817604..fbc5c3561 100644 --- a/src/lib/encoder.cc +++ b/src/lib/encoder.cc @@ -360,6 +360,10 @@ try _full_condition.notify_all (); } } +catch (boost::thread_interrupted& e) { + /* Ignore these and just stop the thread */ + _full_condition.notify_all (); +} catch (...) { store_current (); -- 2.30.2