summaryrefslogtreecommitdiff
path: root/src/lib/j2k_encoder.cc
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2020-04-14 00:44:33 +0200
committerCarl Hetherington <cth@carlh.net>2020-04-14 00:44:33 +0200
commit778a8b0e19715ed98969ce84cdf4859e1e0e7e52 (patch)
treecf5beb2423de9760c4410de2687c6b103db414b6 /src/lib/j2k_encoder.cc
parent747e81de1927c71b39dc916be05bb9296ca6b882 (diff)
Try to give a better error when we fail to start J2K encoding
(probably because of a lack of addressable RAM). See #1540.
Diffstat (limited to 'src/lib/j2k_encoder.cc')
-rw-r--r--src/lib/j2k_encoder.cc3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/lib/j2k_encoder.cc b/src/lib/j2k_encoder.cc
index ac420517f..3d7b342da 100644
--- 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: