diff options
| author | Carl Hetherington <cth@carlh.net> | 2016-06-20 17:16:20 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2016-06-20 17:16:20 +0100 |
| commit | ad401edb701117f5aa6586239ef803b74ac3fb35 (patch) | |
| tree | 51bf7b0ba6939a44ca8e9802d60f81d2de535d58 /src/lib | |
| parent | 01884ed880e5519bd9d37db882216a81dfafdf8b (diff) | |
| parent | 41737ca62d65bcd6c25ec1080c0c7e0e6e6ae9b2 (diff) | |
Merge branch 'fix-encoder-threading' of ssh://git.carlh.net/home/carl/git/dcpomatic into fix-encoder-threading
Diffstat (limited to 'src/lib')
| -rw-r--r-- | src/lib/encoder.cc | 4 |
1 files changed, 4 insertions, 0 deletions
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 (); |