summaryrefslogtreecommitdiff
path: root/src/lib/transcode_job.cc
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2019-05-30 20:08:39 +0100
committerCarl Hetherington <cth@carlh.net>2019-05-30 20:08:39 +0100
commit9b98a07cb61fd66fd73f9f58468100ec9b7eddd3 (patch)
treebb04cfeae771bf571dc919bca0fdf8d10fb0d560 /src/lib/transcode_job.cc
parentfd7cf313b4d809bde22b5189e1ab22c5edbd8f8f (diff)
Destory TranscodeJob earlier, hopefully to fix #1570.
Diffstat (limited to 'src/lib/transcode_job.cc')
-rw-r--r--src/lib/transcode_job.cc10
1 files changed, 9 insertions, 1 deletions
diff --git a/src/lib/transcode_job.cc b/src/lib/transcode_job.cc
index 356e862e0..981816fd5 100644
--- a/src/lib/transcode_job.cc
+++ b/src/lib/transcode_job.cc
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2012-2015 Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2012-2019 Carl Hetherington <cth@carlh.net>
This file is part of DCP-o-matic.
@@ -51,6 +51,14 @@ TranscodeJob::TranscodeJob (shared_ptr<const Film> film)
}
+TranscodeJob::~TranscodeJob ()
+{
+ /* We have to stop the job thread here as we're about to start tearing down
+ the Encoder, which is bad news if the job thread is still feeding it data.
+ */
+ stop_thread ();
+}
+
string
TranscodeJob::name () const
{