X-Git-Url: https://git.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Ftools%2Fdcpomatic_kdm.cc;h=3f156f4b9ece9fbdbe131cfdc69ed2c131472966;hp=929fab37b3fb431d35b58d56473860f9c740d870;hb=c74d789ed75e87bccd094f45f082674f8f8d2f2f;hpb=03dd6e03f5ee261b9c1ed9328ad2762ef3b62057

diff --git a/src/tools/dcpomatic_kdm.cc b/src/tools/dcpomatic_kdm.cc
index 929fab37b..3f156f4b9 100644
--- a/src/tools/dcpomatic_kdm.cc
+++ b/src/tools/dcpomatic_kdm.cc
@@ -38,6 +38,7 @@
 #include "lib/cinema_kdms.h"
 #include "lib/send_kdm_email_job.h"
 #include "lib/compose.hpp"
+#include "lib/cinema.h"
 #include <dcp/encrypted_kdm.h>
 #include <dcp/decrypted_kdm.h>
 #include <dcp/exceptions.h>
@@ -69,7 +70,7 @@ class KDMFileDialogWrapper : public FileDialogWrapper<dcp::EncryptedKDM>
 {
 public:
 	KDMFileDialogWrapper (wxWindow* parent)
-		: FileDialogWrapper (parent, _("Select DKDM file"))
+		: FileDialogWrapper<dcp::EncryptedKDM> (parent, _("Select DKDM file"))
 	{
 
 	}
@@ -145,7 +146,7 @@ public:
 		vector<string> columns;
 		columns.push_back (wx_to_std (_("CPL")));
 		_dkdm = new EditableList<dcp::EncryptedKDM, KDMFileDialogWrapper> (
-			overall_panel, columns, bind (&DOMFrame::dkdms, this), bind (&DOMFrame::set_dkdms, this, _1), bind (&column, _1), false
+			overall_panel, columns, bind (&DOMFrame::dkdms, this), bind (&DOMFrame::set_dkdms, this, _1), bind (&always_valid), bind (&column, _1), false
 			);
 		vertical->Add (_dkdm, 0, wxEXPAND | wxALL, DCPOMATIC_SIZER_Y_GAP);
 
@@ -270,7 +271,11 @@ private:
 
 				/* Make an empty KDM */
 				dcp::DecryptedKDM kdm (
-					_timing->from(), _timing->until(), decrypted.annotation_text(), decrypted.content_title_text(), dcp::LocalTime().as_string()
+					dcp::LocalTime (_timing->from(), i->cinema->utc_offset_hour(), i->cinema->utc_offset_minute()),
+					dcp::LocalTime (_timing->until(), i->cinema->utc_offset_hour(), i->cinema->utc_offset_minute()),
+					decrypted.annotation_text(),
+					decrypted.content_title_text(),
+					dcp::LocalTime().as_string()
 					);
 
 				/* Add keys from the DKDM */