Merge branch 'master' of /home/carl/git/dvdomatic

[dcpomatic.git] / src / lib / transcode_job.cc

diff --git a/src/lib/transcode_job.cc b/src/lib/transcode_job.cc
index f4e3d7af9cee1a02a5f2e57bc159c47ab8b1dd64..9113593f0c1976c4967df5df7e9c7bea509d38d4 100644 (file)
--- a/src/lib/transcode_job.cc
+++ b/src/lib/transcode_job.cc
@@ -78,7 +78,6 @@ TranscodeJob::run ()
                _log->log (s.str ());
 
                throw;
-
        }
 }
 
@@ -89,8 +88,8 @@ TranscodeJob::status () const
                return "0%";
        }
 
-       if (_encoder->skipping ()) {
-               return "skipping frames already encoded";
+       if (_encoder->skipping () && !finished ()) {
+               return "skipping already-encoded frames";
        }