From f03eed89e4a2d95926086d6dc4152d2229db3791 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Sun, 2 Aug 2020 23:31:59 +0200 Subject: Don't terminate if a non-DCP directory is given to Open. Cherry-picked from 591c73b472f0eb74225dbc1b08885f552b8814c4 in v2.15.x. --- src/tools/dcpomatic_player.cc | 2 ++ 1 file changed, 2 insertions(+) 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())); } } -- cgit v1.2.3