From: Carl Hetherington <cth@carlh.net>
Date: Wed, 10 Jul 2019 19:47:08 +0000 (+0100)
Subject: swaroop: fix crash when there's an incorrect ecinema KDM.
X-Git-Tag: v2.15.11
X-Git-Url: https://git.carlh.net/gitweb/?a=commitdiff_plain;h=refs%2Ftags%2Fv2.15.11;p=dcpomatic.git

swaroop: fix crash when there's an incorrect ecinema KDM.
---

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;
 			}