diff options
| author | Carl Hetherington <cth@carlh.net> | 2019-02-20 01:10:58 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2019-02-20 01:10:58 +0000 |
| commit | e63de384db89a83937d42f10d4146c3adf14fdb2 (patch) | |
| tree | 721c2fffabf33e91718664cfb98638c8b07cfced /src | |
| parent | f9af0067aae1b9364aae94b8bc6ea5e00d666d1d (diff) | |
Report job errors even if they contain < or >. Give a better error when parsing a subtitle file fails.
Diffstat (limited to 'src')
| -rw-r--r-- | src/lib/job.cc | 6 | ||||
| -rw-r--r-- | src/wx/job_view.cc | 9 |
2 files changed, 13 insertions, 2 deletions
diff --git a/src/lib/job.cc b/src/lib/job.cc index 8cc6ced8e..451776524 100644 --- a/src/lib/job.cc +++ b/src/lib/job.cc @@ -190,6 +190,12 @@ Job::run_wrapper () set_progress (1); set_state (FINISHED_ERROR); + } catch (FileError& e) { + + set_error (e.what(), e.what()); + set_progress (1); + set_state (FINISHED_ERROR); + } catch (std::exception& e) { set_error ( diff --git a/src/wx/job_view.cc b/src/wx/job_view.cc index 174c9967d..b61da04f8 100644 --- a/src/wx/job_view.cc +++ b/src/wx/job_view.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2012-2018 Carl Hetherington <cth@carlh.net> + Copyright (C) 2012-2019 Carl Hetherington <cth@carlh.net> This file is part of DCP-o-matic. @@ -32,6 +32,7 @@ #include "lib/transcode_job.h" #include "lib/analyse_audio_job.h" #include <wx/wx.h> +#include <boost/algorithm/string.hpp> using std::string; using std::min; @@ -109,7 +110,11 @@ JobView::progress () if (!_job->sub_name().empty ()) { whole += _job->sub_name() + " "; } - whole += _job->status (); + string s = _job->status (); + /* Watch out for < > in the error string */ + boost::algorithm::replace_all (s, "<", "<"); + boost::algorithm::replace_all (s, ">", ">"); + whole += s; if (whole != _last_message) { _message->SetLabelMarkup (std_to_wx (whole)); /* This hack fixes the size of _message on OS X */ |