X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Flib%2Ftranscode_job.cc;h=1a2202ad2f2b91b9914297c07c9852ff227b3cb7;hb=8acffb9e32b1b608c32768f5c6efafa8d250ede0;hp=4a85fa18aa8935d0a2c0ff5670f504de012b439e;hpb=1f82930e73679d6aec5223caa255f564339a1a2a;p=dcpomatic.git

diff --git a/src/lib/transcode_job.cc b/src/lib/transcode_job.cc
index 4a85fa18a..1a2202ad2 100644
--- a/src/lib/transcode_job.cc
+++ b/src/lib/transcode_job.cc
@@ -27,6 +27,7 @@
 #include "film.h"
 #include "transcoder.h"
 #include "log.h"
+#include "safe_stringstream.h"
 
 #include "i18n.h"
 
@@ -34,7 +35,6 @@
 #define LOG_ERROR_NC(...)   _film->log()->log (__VA_ARGS__, Log::TYPE_ERROR);
 
 using std::string;
-using std::stringstream;
 using std::fixed;
 using std::setprecision;
 using std::cout;
@@ -76,9 +76,6 @@ TranscodeJob::run ()
 		_transcoder.reset ();
 
 	} catch (...) {
-		set_progress (1);
-		set_state (FINISHED_ERROR);
-		LOG_ERROR_NC (N_("Transcode job failed or cancelled"));
 		_transcoder.reset ();
 		throw;
 	}
@@ -96,12 +93,13 @@ TranscodeJob::status () const
 		return Job::status ();
 	}
 
-	stringstream s;
+	SafeStringStream s;
 
 	s << Job::status ();
 
 	if (!finished () && !_transcoder->finishing ()) {
-		s << "; " << fixed << setprecision (1) << fps << " " << _("frames per second");
+		/// TRANSLATORS: fps here is an abbreviation for frames per second
+		s << "; " << fixed << setprecision (1) << fps << " " << _("fps");
 	}
 	
 	return s.str ();