diff options
| author | Carl Hetherington <cth@carlh.net> | 2019-07-10 20:47:08 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2019-07-10 20:47:08 +0100 |
| commit | 2ecead272e146c78850e333fa408395d51fdd132 (patch) | |
| tree | f3f27e5b8c18e97b15e8dee3528360b67656cbdb | |
| parent | e0da7a310a9e7f05c7c75fa7b39f1fb110567d60 (diff) | |
swaroop: fix crash when there's an incorrect ecinema KDM.v2.15.11
| -rw-r--r-- | src/wx/swaroop_controls.cc | 8 |
1 files 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<Job>()); } 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; } |