From 4e558894d1f75f0d8aa64283e8b595a06c77869b Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Sun, 23 Dec 2018 22:31:52 +0000 Subject: [PATCH] Fix crash on trying to use an invalid KDM. --- src/wx/swaroop_controls.cc | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/wx/swaroop_controls.cc b/src/wx/swaroop_controls.cc index d6ab5c39d..2202dff2a 100644 --- a/src/wx/swaroop_controls.cc +++ b/src/wx/swaroop_controls.cc @@ -30,6 +30,7 @@ #include "lib/scoped_temporary.h" #include "lib/internet.h" #include +#include #include #include @@ -396,8 +397,12 @@ SwaroopControls::spl_selection_changed () kdm = get_kdm_from_directory (dcp); } if (kdm) { - dcp->add_kdm (*kdm); - dcp->examine (_film, shared_ptr()); + try { + dcp->add_kdm (*kdm); + dcp->examine (_film, shared_ptr()); + } catch (KDMError& e) { + error_dialog (this, "Could not load KDM."); + } } if (dcp->needs_kdm()) { /* We didn't get a KDM for this */ -- 2.30.2