summaryrefslogtreecommitdiff
path: root/src/tools
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2014-12-09 11:00:22 +0000
committerCarl Hetherington <cth@carlh.net>2014-12-09 11:00:22 +0000
commit1d04ff19d3480966b4d157013cb87c9fc3fc44f9 (patch)
tree6bcd2679f59a5edea9f8edcd85af5191bf7fc930 /src/tools
parente159aafa457003982101cb6c03674d5e2ed2c0ab (diff)
Hand apply 5e96dbee6de3b4baf82083e5c7169f27e6051c5b from master; give a nicer error when writing config fails.
Diffstat (limited to 'src/tools')
-rw-r--r--src/tools/dcpomatic.cc5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/tools/dcpomatic.cc b/src/tools/dcpomatic.cc
index 0c82898aa..27f029d9b 100644
--- a/src/tools/dcpomatic.cc
+++ b/src/tools/dcpomatic.cc
@@ -839,8 +839,11 @@ class App : public wxApp
{
try {
throw;
+ } catch (FileError& e) {
+ error_dialog (0, wxString::Format (_("An exception occurred: %s in %s.\n\n" + REPORT_PROBLEM), e.what(), e.file().string().c_str ()));
} catch (exception& e) {
- error_dialog (0, wxString::Format (_("An exception occurred (%s)."), e.what ()) + " " + REPORT_PROBLEM); } catch (...) {
+ error_dialog (0, wxString::Format (_("An exception occurred: %s.\n\n"), e.what ()) + " " + REPORT_PROBLEM);
+ } catch (...) {
error_dialog (0, _("An unknown exception occurred.") + " " + REPORT_PROBLEM);
}