Changeset 96642 in vbox for trunk/src/VBox

Timestamp:

Sep 7, 2022 7:20:35 PM (2 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9515. In expert page of new vm wizard, re-guess guest OS type from user entered name in case OS detection from ISO fails.

Location:

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

Files:

• UIWizardNewVMExpertPage.cpp (modified) (2 diffs)
• UIWizardNewVMNameOSTypePage.cpp (modified) (1 diff)

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

@@ -167 +167 @@
     pWizard->setISOFilePath(strISOPath);
 
-    if (UIWizardNewVMNameOSTypeCommon::guessOSTypeDetectedOSTypeString(m_pNameAndSystemEditor, pWizard->detectedOSTypeId()))
+    bool const fOsTypeFixed = UIWizardNewVMNameOSTypeCommon::guessOSTypeDetectedOSTypeString(m_pNameAndSystemEditor, pWizard->detectedOSTypeId());
+    if (fOsTypeFixed)
         m_userModifiedParameters << "GuestOSTypeFromISO";
     else /* Remove GuestOSTypeFromISO from the set if it is there: */
@@ -183 +184 @@
     setSkipCheckBoxEnable();
     disableEnableUnattendedRelatedWidgets(isUnattendedEnabled());
+
+    /* Redetect the OS type using the name if detection or the step above failed: */
+    if (!fOsTypeFixed)
+        sltNameChanged(m_pNameAndSystemEditor->name());
+
     emit completeChanged();
 }

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

@@ -300 +300 @@
     pNameAndSystemEditor->setType(uiCommon().vmGuestOSType("Other"));
     /* Return false to allow OS type guessing from name. See caller code: */
-    /** @todo the caller doesn't actually re-guess from the name, which leaves it
-     *        with this annoying 'other' selection. */
     return false;
 }