From 3e19bf7df70928442644b225c876d51f9fa413da Mon Sep 17 00:00:00 2001
From: Carl Hetherington <cth@carlh.net>
Date: Tue, 25 Sep 2018 01:28:37 +0100
Subject: [PATCH] Fix log display and auto-load KDMs from the configured
 directory.

---
 src/tools/dcpomatic_player.cc | 21 +++++++++++++++++++++
 src/wx/controls.cc            |  2 ++
 2 files changed, 23 insertions(+)

diff --git a/src/tools/dcpomatic_player.cc b/src/tools/dcpomatic_player.cc
index 07583ccaf..db9b21d92 100644
--- a/src/tools/dcpomatic_player.cc
+++ b/src/tools/dcpomatic_player.cc
@@ -315,6 +315,27 @@ public:
 			return;
 		}
 
+		/* The DCP has been examined and loaded */
+
+		optional<boost::filesystem::path> kdm_dir = Config::instance()->player_kdm_directory();
+		if (dcp->needs_kdm() && kdm_dir) {
+			/* Look for a KDM */
+			using namespace boost::filesystem;
+			for (directory_iterator i = directory_iterator(*kdm_dir); i != directory_iterator(); ++i) {
+				if (file_size(i->path()) < MAX_KDM_SIZE) {
+					try {
+						dcp::EncryptedKDM kdm(dcp::file_to_string(i->path()));
+						if (kdm.cpl_id() == dcp->cpl()) {
+							dcp->add_kdm (kdm);
+							dcp->examine (shared_ptr<Job>());
+						}
+					} catch (...) {
+						/* Hey well */
+					}
+				}
+			}
+		}
+
 		setup_from_dcp (dcp);
 
 		if (dcp->three_d()) {
diff --git a/src/wx/controls.cc b/src/wx/controls.cc
index bc373812d..1f6a30ae9 100644
--- a/src/wx/controls.cc
+++ b/src/wx/controls.cc
@@ -83,6 +83,7 @@ Controls::Controls (wxWindow* parent, shared_ptr<FilmViewer> viewer, bool editor
 	e_sizer->Add (_log, 1, wxALL | wxEXPAND, DCPOMATIC_SIZER_GAP);
 
 	_dcp_directory->Show (false);
+	_log->Show (false);
 
 	_v_sizer->Add (e_sizer, 0, wxEXPAND);
 
@@ -457,6 +458,7 @@ void
 Controls::show_extended_player_controls (bool s)
 {
 	_dcp_directory->Show (s);
+	_log->Show (s);
 }
 
 void
-- 
2.30.2