projects
/
dcpomatic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
768287d
)
Don't terminate if a non-DCP directory is given to Open.
author
Carl Hetherington
<cth@carlh.net>
Sun, 2 Aug 2020 21:31:59 +0000
(23:31 +0200)
committer
Carl Hetherington
<cth@carlh.net>
Sun, 2 Aug 2020 21:48:51 +0000
(21:48 +0000)
Cherry-picked from
591c73b472f0eb74225dbc1b08885f552b8814c4
in v2.15.x.
src/tools/dcpomatic_player.cc
patch
|
blob
|
history
diff --git
a/src/tools/dcpomatic_player.cc
b/src/tools/dcpomatic_player.cc
index 9511990aefca6e1483747bddc87164e4abc46e6d..3495c78d411d82166ab04dda2fb3410b7f50150c 100644
(file)
--- 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()));
}
}