projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Extract common code out into kdm_for_screen()
[dcpomatic.git]
/
src
/
lib
/
j2k_encoder.cc
diff --git
a/src/lib/j2k_encoder.cc
b/src/lib/j2k_encoder.cc
index ac420517f9ea27f9617d233ac300d98686e450c3..3d7b342da42d066958d643c9a64e4ea48a51b36d 100644
(file)
--- a/
src/lib/j2k_encoder.cc
+++ b/
src/lib/j2k_encoder.cc
@@
-116,6
+116,9
@@
J2KEncoder::end ()
terminate_threads ();
+ /* Something might have been thrown during terminate_threads */
+ rethrow ();
+
LOG_GENERAL (N_("Mopping up %1"), _queue.size());
/* The following sequence of events can occur in the above code: