From 49281333410c321e616c5d3cfd4308e21d0c9cb4 Mon Sep 17 00:00:00 2001
From: Carl Hetherington <cth@carlh.net>
Date: Fri, 12 Jan 2018 21:29:00 +0000
Subject: Fix crash when loading an incorrect KDM.

---
 src/tools/dcpomatic_player.cc | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/tools/dcpomatic_player.cc b/src/tools/dcpomatic_player.cc
index f6f329c42..0464ce96e 100644
--- a/src/tools/dcpomatic_player.cc
+++ b/src/tools/dcpomatic_player.cc
@@ -289,13 +289,12 @@ private:
 			DCPOMATIC_ASSERT (dcp);
 			try {
 				dcp->add_kdm (dcp::EncryptedKDM (dcp::file_to_string (wx_to_std (d->GetPath ()), MAX_KDM_SIZE)));
+				dcp->examine (shared_ptr<Job>());
 			} catch (exception& e) {
 				error_dialog (this, wxString::Format (_("Could not load KDM (%s)"), std_to_wx(e.what())));
 				d->Destroy ();
 				return;
 			}
-
-			dcp->examine (shared_ptr<Job>());
 		}
 
 		d->Destroy ();
-- 
cgit v1.2.3