summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2020-01-16 23:41:51 +0100
committerCarl Hetherington <cth@carlh.net>2020-01-16 23:41:51 +0100
commit07397e3aa8fff4613cea0b833ca8db8e0f60844b (patch)
treeb01e206a5bc902fb57b9992b7970285228843455
parentdf62a2d137400c6c6286675f30597b91203e6374 (diff)
parent94ee305348f7d3eb548fd44ca4aa1c57645056b1 (diff)
Merge branch 'master' of ssh://git.carlh.net/home/carl/git/dcpomatic
-rw-r--r--src/lib/exceptions.h5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/lib/exceptions.h b/src/lib/exceptions.h
index 766d3d8d5..99f0a5d87 100644
--- a/src/lib/exceptions.h
+++ b/src/lib/exceptions.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2012-2014 Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2012-2020 Carl Hetherington <cth@carlh.net>
This file is part of DCP-o-matic.
@@ -25,6 +25,7 @@
#ifndef DCPOMATIC_EXCEPTIONS_H
#define DCPOMATIC_EXCEPTIONS_H
+#include "compose.hpp"
extern "C" {
#include <libavutil/pixfmt.h>
}
@@ -73,7 +74,7 @@ public:
* @param f Name of the file that this exception concerns.
*/
FileError (std::string m, boost::filesystem::path f)
- : std::runtime_error (m)
+ : std::runtime_error (String::compose("%1 with %2", m, f.string()))
, _file (f)
{}