projects
/
dcpomatic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
09c7979
)
Allow _film to be 0.
author
Carl Hetherington
<cth@carlh.net>
Tue, 6 Oct 2015 11:37:21 +0000
(12:37 +0100)
committer
Carl Hetherington
<cth@carlh.net>
Fri, 9 Oct 2015 12:44:50 +0000
(13:44 +0100)
src/lib/send_problem_report_job.cc
patch
|
blob
|
history
diff --git
a/src/lib/send_problem_report_job.cc
b/src/lib/send_problem_report_job.cc
index b81b0439b72aff167ebbac1d607af7ec4b41f1b2..d0532a0479cf51d551c9dc48696d2307a7e1e3bb 100644
(file)
--- a/
src/lib/send_problem_report_job.cc
+++ b/
src/lib/send_problem_report_job.cc
@@
-32,6
+32,7
@@
using std::string;
using std::list;
using boost::shared_ptr;
using std::list;
using boost::shared_ptr;
+/** @param film Film thta the problem is with, or 0 */
SendProblemReportJob::SendProblemReportJob (
shared_ptr<const Film> film,
string from,
SendProblemReportJob::SendProblemReportJob (
shared_ptr<const Film> film,
string from,
@@
-47,6
+48,10
@@
SendProblemReportJob::SendProblemReportJob (
string
SendProblemReportJob::name () const
{
string
SendProblemReportJob::name () const
{
+ if (!_film) {
+ return _("Email problem report");
+ }
+
return String::compose (_("Email problem report for %1"), _film->name());
}
return String::compose (_("Email problem report for %1"), _film->name());
}
@@
-70,13
+75,15
@@
SendProblemReportJob::run ()
body += "Version: " + string (dcpomatic_version) + " " + string (dcpomatic_git_commit) + "\n\n";
body += "Version: " + string (dcpomatic_version) + " " + string (dcpomatic_git_commit) + "\n\n";
- body += "log head and tail:\n";
- body += "---<8----\n";
- body += _film->log()->head_and_tail (4096);
- body += "---<8----\n\n";
+ if (_film) {
+ body += "log head and tail:\n";
+ body += "---<8----\n";
+ body += _film->log()->head_and_tail (4096);
+ body += "---<8----\n\n";
- add_file (body, "ffprobe.log");
- add_file (body, "metadata.xml");
+ add_file (body, "ffprobe.log");
+ add_file (body, "metadata.xml");
+ }
quickmail_set_body (mail, body.c_str());
quickmail_set_body (mail, body.c_str());