projects
/
dcpomatic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
126ba9a
)
Fix unnecessary condition.
author
Carl Hetherington
<cth@carlh.net>
Mon, 9 Nov 2020 00:12:05 +0000
(
01:12
+0100)
committer
Carl Hetherington
<cth@carlh.net>
Mon, 16 Nov 2020 00:40:36 +0000
(
01:40
+0100)
src/lib/util.cc
patch
|
blob
|
history
diff --git
a/src/lib/util.cc
b/src/lib/util.cc
index 0a060e96084ccf55cd9e913cbf88adc5d6c5afac..90d78b32e42dbf30edcf321fba6adf83e97b2b54 100644
(file)
--- a/
src/lib/util.cc
+++ b/
src/lib/util.cc
@@
-1247,7
+1247,7
@@
decrypt_kdm_with_helpful_error (dcp::EncryptedKDM kdm)
}
if (!on_chain) {
throw KDMError (_("This KDM was not made for DCP-o-matic's decryption certificate."), e.what());
}
if (!on_chain) {
throw KDMError (_("This KDM was not made for DCP-o-matic's decryption certificate."), e.what());
- } else if (
on_chain &&
kdm_subject_name != dc->leaf().subject()) {
+ } else if (kdm_subject_name != dc->leaf().subject()) {
throw KDMError (_("This KDM was made for DCP-o-matic but not for its leaf certificate."), e.what());
} else {
throw;
throw KDMError (_("This KDM was made for DCP-o-matic but not for its leaf certificate."), e.what());
} else {
throw;