Changeset 97691 in vbox for trunk

Timestamp:

Nov 28, 2022 3:52:11 PM (2 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9950 Clear virtual hard disk related variables as selection changes.

Location:

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

Files:

• UIWizardNewVM.cpp (modified) (1 diff)
• UIWizardNewVMDiskPage.cpp (modified) (2 diffs)
• UIWizardNewVMExpertPage.cpp (modified) (2 diffs)

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

@@ -590 +590 @@
         return;
     CMedium medium = uiCommon().medium(mediumId).medium();
-    if (!medium.isNull())
-        setVirtualDisk(medium);
+    setVirtualDisk(medium);
 }
 

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

@@ -168 +168 @@
     m_userModifiedParameters << "SelectedDiskSource";
     if (m_pDiskSourceButtonGroup->checkedButton() == m_pDiskEmpty)
+    {
         pWizard->setDiskSource(SelectedDiskSource_Empty);
+        pWizard->setVirtualDisk(QUuid());
+        pWizard->setMediumPath(QString());
+    }
     else if (m_pDiskSourceButtonGroup->checkedButton() == m_pDiskExisting)
     {
@@ -176 +180 @@
     }
     else
+    {
         pWizard->setDiskSource(SelectedDiskSource_New);
+        pWizard->setVirtualDisk(QUuid());
+        pWizard->setMediumPath(QString());
+    }
 
     setEnableDiskSelectionWidgets(pWizard->diskSource() == SelectedDiskSource_Existing);

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

@@ -795 +795 @@
     AssertReturnVoid(pWizard);
     m_userModifiedParameters << "SelectedDiskSource";
+
     if (m_pDiskSourceButtonGroup->checkedButton() == m_pDiskEmpty)
+    {
         pWizard->setDiskSource(SelectedDiskSource_Empty);
+        pWizard->setVirtualDisk(QUuid());
+        pWizard->setMediumPath(QString());
+    }
     else if (m_pDiskSourceButtonGroup->checkedButton() == m_pDiskExisting)
     {
@@ -804 +809 @@
     }
     else
+    {
         pWizard->setDiskSource(SelectedDiskSource_New);
+        pWizard->setVirtualDisk(QUuid());
+        pWizard->setMediumPath(QString());
+    }
 
     setEnableDiskSelectionWidgets(pWizard->diskSource() == SelectedDiskSource_Existing);