Changeset 92105 in vbox for trunk/src

Timestamp:

Oct 27, 2021 1:44:20 PM (3 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9996. Cleaning the machine folder in case vm creation fails

Location:

trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm

Files:

• UIWizardNewVM.cpp (modified) (4 diffs)
• UIWizardNewVMExpertPage.cpp (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVM.cpp

@@ -115 +115 @@
 void UIWizardNewVM::wizardClean()
 {
+    /* Try to delete the hard disk in case we have created one: */
+    deleteVirtualDisk();
+    /* Cleanup the machine folder: */
     UIWizardNewVMNameOSTypeCommon::cleanupMachineFolder(this, true);
 }
@@ -135 +138 @@
         {
             msgCenter().cannotCreateMachine(vbox, this);
-            /* Try to delete the hard disk: */
-            deleteVirtualDisk();
+            wizardClean();
             return false;
         }
@@ -166 +168 @@
     if (!vbox.isOk())
     {
-        /* Try to delete the hard disk: */
-        deleteVirtualDisk();
         msgCenter().cannotRegisterMachine(vbox, m_machine.GetName(), this);
+        wizardClean();
         return false;
     }
@@ -466 +467 @@
 void UIWizardNewVM::sltHandleWizardCancel()
 {
-    UIWizardNewVMNameOSTypeCommon::cleanupMachineFolder(this, true);
+    wizardClean();
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMExpertPage.cpp

@@ -612 +612 @@
     UIWizardNewVM *pWizard = wizardWindow<UIWizardNewVM>();
     AssertReturn(pWizard, false);
-    bool fResult = true;
+    bool fResult = UIWizardNewVMNameOSTypeCommon::createMachineFolder(m_pNameAndSystemEditor, this, wizardWindow<UIWizardNewVM>());
+    if (!fResult)
+        return false;
 
     if (pWizard->diskSource() == SelectedDiskSource_New)