Fix 1 crash on low memory.

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

diff --git a/src/lib/transcode_job.cc b/src/lib/transcode_job.cc
index c9ec2053d46353a500cd6c4178af395a6c303906..f0e22da64483d2166bf0adfe08e37d7946df393e 100644 (file)
--- a/src/lib/transcode_job.cc
+++ b/src/lib/transcode_job.cc
@@ -63,13 +63,13 @@ TranscodeJob::run ()
                set_state (FINISHED_OK);
 
                _film->log()->log (N_("Transcode job completed successfully"));
+               _transcoder.reset ();
 
-       } catch (std::exception& e) {
-
+       } catch (...) {
                set_progress (1);
                set_state (FINISHED_ERROR);
-               _film->log()->log (String::compose (N_("Transcode job failed (%1)"), e.what()));
-
+               _film->log()->log (N_("Transcode job failed or cancelled"));
+               _transcoder.reset ();
                throw;
        }
 }
@@ -78,7 +78,7 @@ string
 TranscodeJob::status () const
 {
        if (!_transcoder) {
-               return _("0%");
+               return Job::status ();
        }
 
        float const fps = _transcoder->current_encoding_rate ();
@@ -90,13 +90,8 @@ TranscodeJob::status () const
 
        s << Job::status ();
 
-       if (!finished ()) {
-               if (_transcoder->state() == Encoder::TRANSCODING) {
-                       s << "; " << fixed << setprecision (1) << fps << N_(" ") << _("frames per second");
-               } else {
-                       /* TRANSLATORS: this means `computing a hash' as in a digest of a block of data */
-                       s << "; " << _("hashing");
-               }
+       if (!finished () && !_transcoder->finishing ()) {
+               s << "; " << fixed << setprecision (1) << fps << " " << _("frames per second");
        }
        
        return s.str ();