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 (
/*
- 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.
#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;
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 */