X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fj2k_encoder.cc;fp=src%2Flib%2Fj2k_encoder.cc;h=4e2a30ef722cd7a45bcf42dc27c84b90da497a1d;hb=e3c7656f9dc0acbaf518c051b847ee2e4eb7ba23;hp=d8d8209c91145f78f2039f84ec1f9fb009df0a5c;hpb=09860271bb6d03b3937c08bffb4c672697f6d711;p=dcpomatic.git

diff --git a/src/lib/j2k_encoder.cc b/src/lib/j2k_encoder.cc
index d8d8209c9..4e2a30ef7 100644
--- a/src/lib/j2k_encoder.cc
+++ b/src/lib/j2k_encoder.cc
@@ -64,14 +64,7 @@ J2KEncoder::J2KEncoder (shared_ptr<const Film> film, shared_ptr<Writer> writer)
 
 J2KEncoder::~J2KEncoder ()
 {
-	try {
-		terminate_threads ();
-	} catch (...) {
-		/* Destructors must not throw exceptions; anything bad
-		   happening now is too late to worry about anyway,
-		   I think.
-		*/
-	}
+	terminate_threads ();
 }
 
 void
@@ -246,6 +239,8 @@ J2KEncoder::encode (shared_ptr<PlayerVideo> pv, DCPTime time)
 void
 J2KEncoder::terminate_threads ()
 {
+	boost::this_thread::disable_interruption dis;
+
 	if (!_threads) {
 		return;
 	}