Changeset 93456 in vbox

Timestamp:

Jan 27, 2022 10:06:47 AM (3 years ago)

Author:

vboxsync

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

149568

Message:

FE/Qt: bugref:9371. Don't guess OS type from vm name if we have successfully detected it from the ISO.

Location:

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

Files:

• UIWizardNewVMExpertPage.cpp (modified) (3 diffs)
• UIWizardNewVMNameOSTypePage.cpp (modified) (3 diffs)

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

@@ -87 +87 @@
 {
     AssertReturnVoid(wizardWindow<UIWizardNewVM>());
-    if (!m_userModifiedParameters.contains("GuestOSType") && m_pNameAndSystemEditor)
+    /* Allow type guessing from name only if an OS type from ISO could not be detected: */
+    if (!m_userModifiedParameters.contains("GuestOSTypeFromISO") && m_pNameAndSystemEditor)
     {
         m_pNameAndSystemEditor->blockSignals(true);
@@ -95 +96 @@
             /* Since the type `possibly` changed: */
             setOSTypeDependedValues();
+            m_userModifiedParameters << "GuestOSTypeFromName";
         }
         m_pNameAndSystemEditor->blockSignals(false);
@@ -148 +150 @@
     UIWizardNewVMNameOSTypeCommon::detectOSType(strISOPath, pWizard);
 
-    if (!m_userModifiedParameters.contains("GuestOSType"))
-        UIWizardNewVMNameOSTypeCommon::guessOSTypeDetectedOSTypeString(m_pNameAndSystemEditor, pWizard->detectedOSTypeId());
+
+    if (UIWizardNewVMNameOSTypeCommon::guessOSTypeDetectedOSTypeString(m_pNameAndSystemEditor, pWizard->detectedOSTypeId()))
+        m_userModifiedParameters << "GuestOSTypeFromISO";
+    else /* Remove GuestOSTypeFromISO fromthe set if it is there: */
+        m_userModifiedParameters.remove("GuestOSTypeFromISO");
+
     pWizard->setISOFilePath(strISOPath);
 

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

@@ -205 +205 @@
     AssertReturn(pNameAndSystemEditor, false);
     if (strDetectedOSType.isEmpty())
+    {
         pNameAndSystemEditor->setType(uiCommon().vmGuestOSType("Other"));
+        /* Return false to allow OS type guessing from name. See caller code: */
+        return false;
+    }
     /* Append 32 as bit-count if the name has no 64 and 32 in the name since API returns a type name with no arch bit count for 32-bit OSs: */
     if (!strDetectedOSType.contains("32") && !strDetectedOSType.contains("64"))
@@ -390 +394 @@
 {
     AssertReturnVoid(wizardWindow<UIWizardNewVM>());
-    if (!m_userModifiedParameters.contains("GuestOSType"))
+    if (!m_userModifiedParameters.contains("GuestOSTypeFromISO"))
     {
         m_pNameAndSystemEditor->blockSignals(true);
         if (UIWizardNewVMNameOSTypeCommon::guessOSTypeFromName(m_pNameAndSystemEditor, strNewName))
+        {
             wizardWindow<UIWizardNewVM>()->setGuestOSType(m_pNameAndSystemEditor->type());
+            m_userModifiedParameters << "GuestOSTypeFromName";
+        }
         m_pNameAndSystemEditor->blockSignals(false);
     }
@@ -474 +481 @@
     UIWizardNewVMNameOSTypeCommon::detectOSType(strPath, pWizard);
 
-    if (!m_userModifiedParameters.contains("GuestOSType"))
-        UIWizardNewVMNameOSTypeCommon::guessOSTypeDetectedOSTypeString(m_pNameAndSystemEditor, pWizard->detectedOSTypeId());
+    if (UIWizardNewVMNameOSTypeCommon::guessOSTypeDetectedOSTypeString(m_pNameAndSystemEditor, pWizard->detectedOSTypeId()))
+        m_userModifiedParameters << "GuestOSTypeFromISO";
+    else /* Remove GuestOSTypeFromISO fromthe set if it is there: */
+        m_userModifiedParameters.remove("GuestOSTypeFromISO");
+
     pWizard->setISOFilePath(strPath);