Fix crash at the end of encodes.
authorCarl Hetherington <cth@carlh.net>
Tue, 11 Feb 2014 09:50:33 +0000 (09:50 +0000)
committerCarl Hetherington <cth@carlh.net>
Tue, 11 Feb 2014 09:50:33 +0000 (09:50 +0000)
src/lib/transcode_job.cc

index f0e22da64483d2166bf0adfe08e37d7946df393e..5c195ee1b781227637068f58ff62bf5425ca1612 100644 (file)
@@ -100,17 +100,20 @@ TranscodeJob::status () const
 int
 TranscodeJob::remaining_time () const
 {
-       if (!_transcoder) {
+       /* _transcoder might be destroyed by the job-runner thread */
+       shared_ptr<Transcoder> t = _transcoder;
+       
+       if (!t) {
                return 0;
        }
        
-       float fps = _transcoder->current_encoding_rate ();
+       float fps = t->current_encoding_rate ();
 
        if (fps == 0) {
                return 0;
        }
 
        /* Compute approximate proposed length here, as it's only here that we need it */
-       OutputVideoFrame const left = _film->time_to_video_frames (_film->length ()) - _transcoder->video_frames_out();
+       OutputVideoFrame const left = _film->time_to_video_frames (_film->length ()) - t->video_frames_out();
        return left / fps;
 }