Don't show warning when only removing an empty DKDM folder (#2541).

[dcpomatic.git] / src / tools / dcpomatic_kdm.cc

diff --git a/src/tools/dcpomatic_kdm.cc b/src/tools/dcpomatic_kdm.cc
index e2993f9f27ab163c449584d7bf0e5a7d03892b6c..6628c2b3f6734def9a9908fe6de7e9a0da2254ab 100644 (file)
--- a/src/tools/dcpomatic_kdm.cc
+++ b/src/tools/dcpomatic_kdm.cc
@@ -74,6 +74,7 @@ LIBDCP_ENABLE_WARNINGS
 #endif
 
 
+using std::dynamic_pointer_cast;
 using std::exception;
 using std::list;
 using std::make_shared;
@@ -86,7 +87,6 @@ using std::vector;
 using boost::bind;
 using boost::optional;
 using boost::ref;
-using std::dynamic_pointer_cast;
 #if BOOST_VERSION >= 106100
 using namespace boost::placeholders;
 #endif
@@ -458,7 +458,7 @@ private:
                        if (e.starts_too_early()) {
                                error_dialog(this, _("The KDM start period is before (or close to) the start of the signing certificate's validity period.  Use a later start time for this KDM."));
                        } else {
-                               error_dialog(this, _("The KDM end period is after (or close to) the end of the signing certficates' validity period.  Either use an earlier end time for this KDM or re-create your signing certificates in the DCP-o-matic preferences window."));
+                               error_dialog(this, _("The KDM end period is after (or close to) the end of the signing certificates' validity period.  Either use an earlier end time for this KDM or re-create your signing certificates in the DCP-o-matic preferences window."));
                        }
                        return;
                } catch (dcp::NotEncryptedError& e) {
@@ -527,6 +527,15 @@ private:
                        group = to->second->parent();
                }
 
+               /* Check we're not adding a group to one of its children */
+               auto to_parent = group;
+               while (to_parent) {
+                       if (from->second == to_parent) {
+                               return;
+                       }
+                       to_parent = to_parent->parent();
+               }
+
                DCPOMATIC_ASSERT (group);
                DCPOMATIC_ASSERT (from->second->parent ());
 
@@ -559,6 +568,15 @@ private:
                        dcp::DecryptedKDM dkdm(ekdm, chain->key().get());
 
                        auto new_dkdm = make_shared<DKDM>(ekdm);
+
+                       if (Config::instance()->dkdms()->contains(new_dkdm->dkdm().id())) {
+                               error_dialog(
+                                       this,
+                                       wxString::Format(_("DKDM %s is already in the DKDM list and will not be added again."), std_to_wx(new_dkdm->dkdm().id()))
+                                       );
+                               return;
+                       }
+
                        auto group = dynamic_pointer_cast<DKDMGroup> (selected_dkdm());
                        if (!group) {
                                group = Config::instance()->dkdms ();
@@ -714,12 +732,14 @@ private:
                        return;
                }
 
-               if (NagDialog::maybe_nag (
-                           this, Config::NAG_DELETE_DKDM,
-                           _("You are about to remove a DKDM.  This will make it impossible to decrypt the DCP that the DKDM was made for, and it cannot be undone.  "
-                             "Are you sure?"),
-                           true)) {
-                       return;
+               if (removed->contains_dkdm()) {
+                       if (NagDialog::maybe_nag(
+                                   this, Config::NAG_DELETE_DKDM,
+                                   _("You are about to remove a DKDM.  This will make it impossible to decrypt the DCP that the DKDM was made for, and it cannot be undone.  "
+                                     "Are you sure?"),
+                                   true)) {
+                               return;
+                       }
                }
 
                _dkdm->Delete (dkdm_to_id (removed));