Changeset 60125 in vbox

Timestamp:

Mar 21, 2016 4:12:53 PM (9 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

106133

Message:

FE/Qt: ​bugref:8233: VM Settings: General page: Encryption tab: Prevent error situation allowing to encrypt VM with no password.

File:

• trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsGeneral.cpp (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsGeneral.cpp

@@ -292 +292 @@
                 m_machine.SetName(generalData.m_strName);
 
-            /* Encryption tab data: */
-            if (generalData.m_fEncryptionEnabled != m_cache.base().m_fEncryptionEnabled ||
-                generalData.m_fEncryptionCipherChanged != m_cache.base().m_fEncryptionCipherChanged ||
-                generalData.m_fEncryptionPasswordChanged != m_cache.base().m_fEncryptionPasswordChanged)
+            /* Encryption tab data:
+             * Make sure it either encryption is changed itself,
+             * or the encryption was already enabled and either cipher or password is changed. */
+            if (   generalData.m_fEncryptionEnabled != m_cache.base().m_fEncryptionEnabled
+                || (   m_cache.base().m_fEncryptionEnabled
+                    && (   generalData.m_fEncryptionCipherChanged != m_cache.base().m_fEncryptionCipherChanged
+                        || generalData.m_fEncryptionPasswordChanged != m_cache.base().m_fEncryptionPasswordChanged)))
             {
                 /* Cipher attribute changed? */