projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Report job errors even if they contain < or >. Give a better error when parsing...
[dcpomatic.git]
/
src
/
wx
/
job_view.cc
diff --git
a/src/wx/job_view.cc
b/src/wx/job_view.cc
index 174c9967dab4b95cfdd482da76562b68109df824..b61da04f84da3ff1dd6dbba67f3c1e0187c1a7d5 100644
(file)
--- a/
src/wx/job_view.cc
+++ b/
src/wx/job_view.cc
@@
-1,5
+1,5
@@
/*
/*
- Copyright (C) 2012-201
8
Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2012-201
9
Carl Hetherington <cth@carlh.net>
This file is part of DCP-o-matic.
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 "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;
using std::string;
using std::min;
@@
-109,7
+110,11
@@
JobView::progress ()
if (!_job->sub_name().empty ()) {
whole += _job->sub_name() + " ";
}
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 */
if (whole != _last_message) {
_message->SetLabelMarkup (std_to_wx (whole));
/* This hack fixes the size of _message on OS X */