From 2ecead272e146c78850e333fa408395d51fdd132 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Wed, 10 Jul 2019 20:47:08 +0100 Subject: [PATCH 1/1] swaroop: fix crash when there's an incorrect ecinema KDM. --- src/wx/swaroop_controls.cc | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/wx/swaroop_controls.cc b/src/wx/swaroop_controls.cc index 782109888..5ce6c45fc 100644 --- a/src/wx/swaroop_controls.cc +++ b/src/wx/swaroop_controls.cc @@ -489,7 +489,7 @@ SwaroopControls::select_playlist (int selected, int position) } if (dcp->needs_kdm()) { /* We didn't get a KDM for this */ - error_dialog (this, "This playlist cannot be loaded as a KDM is missing."); + error_dialog (this, "This playlist cannot be loaded as a KDM is missing or incorrect."); deselect_playlist (); return; } @@ -502,10 +502,12 @@ SwaroopControls::select_playlist (int selected, int position) ffmpeg->add_kdm (*kdm); ffmpeg->examine (_film, shared_ptr()); } catch (KDMError& e) { - error_dialog (this, "Could not load KDM."); + error_dialog (this, "This playlist cannot be loaded as a KDM is missing or incorrect."); + deselect_playlist (); + return; } } else { - error_dialog (this, "This playlist cannot be loaded as a KDM is missing."); + error_dialog (this, "This playlist cannot be loaded as a KDM is missing or incorrect."); deselect_playlist (); return; } -- 2.30.2