summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2020-08-02 23:31:59 +0200
committerCarl Hetherington <cth@carlh.net>2020-08-02 21:48:51 +0000
commitf03eed89e4a2d95926086d6dc4152d2229db3791 (patch)
tree442374698f19ed7b9fe6f9593c4c9ac8b13a4bf9
parent768287d3b8fff495f5b86ae9cea750bff7652fe2 (diff)
Don't terminate if a non-DCP directory is given to Open.
Cherry-picked from 591c73b472f0eb74225dbc1b08885f552b8814c4 in v2.15.x.
-rw-r--r--src/tools/dcpomatic_player.cc2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/tools/dcpomatic_player.cc b/src/tools/dcpomatic_player.cc
index 9511990ae..3495c78d4 100644
--- a/src/tools/dcpomatic_player.cc
+++ b/src/tools/dcpomatic_player.cc
@@ -363,6 +363,8 @@ public:
#endif
} catch (dcp::DCPReadError& e) {
error_dialog (this, wxString::Format(_("Could not load a DCP from %s"), std_to_wx(dir.string())), std_to_wx(e.what()));
+ } catch (DCPError& e) {
+ error_dialog (this, wxString::Format(_("Could not load a DCP from %s"), std_to_wx(dir.string())), std_to_wx(e.what()));
}
}