X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fjob.cc;h=65e2567cc824710988cfc953a96b7cbd32c0602b;hb=363dee03e61d65538841541028ed62c91ffca124;hp=31f336b6565500633c5479e1d01ba85c155a927f;hpb=67a68bd971ebe1b35daa3f75873b4ccb53c00ba0;p=dcpomatic.git

diff --git a/src/lib/job.cc b/src/lib/job.cc
index 31f336b65..65e2567cc 100644
--- a/src/lib/job.cc
+++ b/src/lib/job.cc
@@ -87,6 +87,9 @@ Job::start ()
 	_start_time = time (0);
 	_sub_start_time = time (0);
 	_thread = new boost::thread (boost::bind (&Job::run_wrapper, this));
+#ifdef DCPOMATIC_LINUX
+	pthread_setname_np (_thread->native_handle(), "job-wrapper");
+#endif
 }
 
 /** A wrapper for the ::run() method to catch exceptions */
@@ -120,8 +123,9 @@ Job::run_wrapper ()
 		set_error (
 			String::compose (_("Could not open %1"), e.file().string()),
 			String::compose (
-				_("DCP-o-matic could not open the file %1.  Perhaps it does not exist or is in an unexpected format."),
-				boost::filesystem::absolute (e.file()).string()
+				_("DCP-o-matic could not open the file %1 (%2).  Perhaps it does not exist or is in an unexpected format."),
+				boost::filesystem::absolute (e.file()).string(),
+				e.what()
 				)
 			);
 
@@ -134,8 +138,9 @@ Job::run_wrapper ()
 			set_error (
 				String::compose (_("Could not open %1"), e.path1().string ()),
 				String::compose (
-					_("DCP-o-matic could not open the file %1.  Perhaps it does not exist or is in an unexpected format."),
-					boost::filesystem::absolute (e.path1()).string()
+					_("DCP-o-matic could not open the file %1 (%2).  Perhaps it does not exist or is in an unexpected format."),
+					boost::filesystem::absolute (e.path1()).string(),
+					e.what()
 					)
 				);
 		} else {
@@ -169,6 +174,12 @@ Job::run_wrapper ()
 		set_progress (1);
 		set_state (FINISHED_ERROR);
 
+	} catch (dcp::DCPReadError& e) {
+
+		set_error (e.what(), "");//message(), e.detail().get_value_or(""));
+		set_progress (1);
+		set_state (FINISHED_ERROR);
+
 	} catch (std::exception& e) {
 
 		set_error (
@@ -423,8 +434,8 @@ Job::status () const
 		if (t > 10 && r > 0) {
 			boost::posix_time::ptime now = boost::posix_time::second_clock::local_time();
 			boost::posix_time::ptime finish = now + boost::posix_time::seconds(r);
-			char finish_string[6];
-			snprintf (finish_string, sizeof(finish_string), "%02d:%02d", finish.time_of_day().hours(), finish.time_of_day().minutes());
+			char finish_string[16];
+			snprintf (finish_string, sizeof(finish_string), "%02d:%02d", int(finish.time_of_day().hours()), int(finish.time_of_day().minutes()));
 			string day;
 			if (now.date() != finish.date()) {
 				/// TRANSLATORS: the %1 in this string will be filled in with a day of the week