Changeset 54884 in vbox for trunk/src/VBox/Main/src-server

Timestamp:

Mar 20, 2015 5:06:54 PM (10 years ago)

Author:

vboxsync

Message:

Fix for the fix

File:

• trunk/src/VBox/Main/src-server/MediumImpl.cpp (modified) (1 diff)

trunk/src/VBox/Main/src-server/MediumImpl.cpp

@@ -9053 +9053 @@
                 pBase->m->mapProperties.erase(it);
 
-            if (task.mstrNewPasswordId.isEmpty())
+            /* Delete KeyId if encryption is removed or the password did change. */
+            if (   task.mstrNewPasswordId.isNotEmpty()
+                || task.mstrCipher.isEmpty())
             {
                 it = pBase->m->mapProperties.find("CRYPT/KeyId");