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

Timestamp:

Nov 6, 2015 12:41:49 PM (9 years ago)

Author:

vboxsync

Message:

UIWizardNewVMPageBasic3.cpp: Treat 0 return value from GetRecommendedHDD() as no disk.

Location:

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

Files:

• UIWizardNewVMPageBasic3.cpp (modified) (3 diffs)
• UIWizardNewVMPageBasic3.h (modified) (1 diff)

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

@@ -40 +40 @@
 
 UIWizardNewVMPage3::UIWizardNewVMPage3()
+    : m_fRecommendedNoDisk(false)
 {
 }
@@ -224 +225 @@
 
     /* Prepare initial choice: */
-    m_pDiskCreate->setFocus();
-    m_pDiskCreate->setChecked(true);
+    if (field("type").value<CGuestOSType>().GetRecommendedHDD() != 0)
+    {
+        m_pDiskCreate->setFocus();
+        m_pDiskCreate->setChecked(true);
+        m_fRecommendedNoDisk = false;
+    }
+    else
+    {
+        m_pDiskSkip->setFocus();
+        m_pDiskSkip->setChecked(true);
+        m_fRecommendedNoDisk = true;
+    }
     m_pDiskSelector->setCurrentIndex(0);
 }
@@ -255 +266 @@
     if (m_pDiskSkip->isChecked())
     {
-        /* Ask user about disk-less machine: */
-        fResult = msgCenter().confirmHardDisklessMachine(thisImp());
+        /* Ask user about disk-less machine unless that's the recommendation: */
+        if (!m_fRecommendedNoDisk)
+            fResult = msgCenter().confirmHardDisklessMachine(thisImp());
     }
     else if (m_pDiskCreate->isChecked())

trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageBasic3.h

@@ -67 +67 @@
     void ensureNewVirtualDiskDeleted();
 
+    /* Input: */
+    bool m_fRecommendedNoDisk;
+
     /* Variables: */
     CMedium m_virtualDisk;