X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Ftranscode_job.cc;h=fe7132699cdda7509b5b5420c3a0200957e13a9b;hb=734a654a07ba97cb6d55309e00f8525d196c88ce;hp=7144f70d5127242fd7dca122e94713f1b761d2ff;hpb=778fe8cf0625a1ee9c754ebda23ba14c409cf1a2;p=dcpomatic.git

diff --git a/src/lib/transcode_job.cc b/src/lib/transcode_job.cc
index 7144f70d5..fe7132699 100644
--- a/src/lib/transcode_job.cc
+++ b/src/lib/transcode_job.cc
@@ -133,10 +133,13 @@ TranscodeJob::remaining_time () const
 	/* _transcoder might be destroyed by the job-runner thread */
 	shared_ptr<Transcoder> t = _transcoder;
 
-	if (!t) {
-		return 0;
+	if (!t || t->finishing()) {
+		/* We aren't doing any actual encoding so just use the job's guess */
+		return Job::remaining_time ();
 	}
 
+	/* We're encoding so guess based on the current encoding rate */
+
 	float fps = t->current_encoding_rate ();
 
 	if (fps == 0) {