X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Ftranscode_job.cc;h=fb586b0825631da9e9a9efc79038103733735791;hb=001ba1644fc6aa54f91fcaaa62ae7e5de2313bc1;hp=55b4ef9b69aeadc4e9aaf87e397d9bd50aa10cd8;hpb=2cdf3d9f461b12d0925cc54368105bbd177bbbb3;p=dcpomatic.git diff --git a/src/lib/transcode_job.cc b/src/lib/transcode_job.cc index 55b4ef9b6..fb586b082 100644 --- a/src/lib/transcode_job.cc +++ b/src/lib/transcode_job.cc @@ -54,9 +54,6 @@ TranscodeJob::TranscodeJob (shared_ptr 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 (); } @@ -88,8 +85,6 @@ TranscodeJob::run () DCPOMATIC_ASSERT (_encoder); _encoder->go (); - set_progress (1); - set_state (FINISHED_OK); struct timeval finish; gettimeofday (&finish, 0); @@ -113,6 +108,9 @@ TranscodeJob::run () _encoder.reset (); + set_progress (1); + set_state (FINISHED_OK); + } catch (...) { _encoder.reset (); throw;