X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Ftools%2Fdcpomatic_kdm.cc;h=5b296b3002f971268fdcfaf25de5bce818f2d205;hb=142f688c0ebb6938ef2d7f2b7e7c859d12af7e23;hp=9995d80a9819111056549285610c7740d44df378;hpb=f2991b10f26dd8996cfcdcbc2128f7e9db36f634;p=dcpomatic.git

diff --git a/src/tools/dcpomatic_kdm.cc b/src/tools/dcpomatic_kdm.cc
index 9995d80a9..5b296b300 100644
--- a/src/tools/dcpomatic_kdm.cc
+++ b/src/tools/dcpomatic_kdm.cc
@@ -328,7 +328,14 @@ private:
 				}
 
 				/* Encrypt */
-				screen_kdms.push_back (ScreenKDM (i, kdm.encrypt (signer, i->recipient.get(), i->trusted_devices, _output->formulation())));
+				screen_kdms.push_back (
+					ScreenKDM (
+						i,
+						kdm.encrypt (
+							signer, i->recipient.get(), i->trusted_devices, _output->formulation(), true, 0
+							)
+						)
+					);
 			}
 
 			pair<shared_ptr<Job>, int> result = _output->make (
@@ -356,7 +363,7 @@ private:
 		} catch (dcp::NotEncryptedError& e) {
 			error_dialog (this, _("CPL's content is not encrypted."));
 		} catch (exception& e) {
-			error_dialog (this, e.what ());
+			error_dialog (this, std_to_wx(e.what()));
 		} catch (...) {
 			error_dialog (this, _("An unknown exception occurred."));
 		}
@@ -380,7 +387,7 @@ private:
 	{
 		DKDMMap::iterator from = _dkdm_id.find (_dkdm->GetSelection ());
 		DKDMMap::iterator to = _dkdm_id.find (ev.GetItem ());
-		if (from == _dkdm_id.end() || to == _dkdm_id.end()) {
+		if (from == _dkdm_id.end() || to == _dkdm_id.end() || from->first == to->first) {
 			return;
 		}
 
@@ -423,10 +430,8 @@ private:
 			} catch (dcp::KDMFormatError& e) {
 				error_dialog (
 					this,
-					wxString::Format (
-						_("Could not read file as a KDM.  Perhaps it is badly formatted, or not a KDM at all.\n\n%s"),
-						std_to_wx(e.what()).data()
-						)
+					_("Could not read file as a KDM.  Perhaps it is badly formatted, or not a KDM at all."),
+					std_to_wx(e.what())
 					);
 				return;
 			} catch (dcp::KDMDecryptionError) {
@@ -603,7 +608,7 @@ private:
 	}
 	catch (exception& e)
 	{
-		error_dialog (0, wxString::Format ("DCP-o-matic could not start: %s", e.what ()));
+		error_dialog (0, _("DCP-o-matic could not start"), std_to_wx(e.what()));
 		return true;
 	}