Changeset 54732 in vbox for trunk/src/VBox/Frontends/VirtualBox

Timestamp:

Mar 12, 2015 3:20:21 PM (10 years ago)

Author:

vboxsync

Message:

FE/Qt: 7676: Runtime UI: Disk Encryption (DE) support: Ups, forgot the condition in r98900.

File:

• trunk/src/VBox/Frontends/VirtualBox/src/runtime/UISession.cpp (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UISession.cpp

@@ -696 +696 @@
         }
     }
-    /* Ask for disk encryption passwords: */
+    /* Ask for disk encryption passwords if necessary: */
     EncryptionPasswordsMap encryptionPasswords;
-    QPointer<UIAddDiskEncryptionPasswordDialog> pDlg =
-         new UIAddDiskEncryptionPasswordDialog(machineLogic()->activeMachineWindow(),
-                                               encryptedPasswordIds);
-    if (pDlg->exec() == QDialog::Accepted)
-        encryptionPasswords = pDlg->encryptionPasswords();
-    if (pDlg)
-        delete pDlg;
+    if (!encryptedPasswordIds.isEmpty())
+    {
+        QPointer<UIAddDiskEncryptionPasswordDialog> pDlg =
+             new UIAddDiskEncryptionPasswordDialog(machineLogic()->activeMachineWindow(),
+                                                   encryptedPasswordIds);
+        if (pDlg->exec() == QDialog::Accepted)
+            encryptionPasswords = pDlg->encryptionPasswords();
+        if (pDlg)
+            delete pDlg;
+    }
 
     /* Power UP machine: */