Changeset 96640 in vbox for trunk/src/VBox

Timestamp:

Sep 7, 2022 6:10:07 PM (2 years ago)

Author:

vboxsync

Message:

FE/Qt: Call sltNameChanged if ISO detection failed to get a valid OS type ID. bugref:9515

File:

• trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMNameOSTypePage.cpp (modified) (2 diffs)

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

@@ -598 +598 @@
     pWizard->setISOFilePath(strPath);
 
-    if (UIWizardNewVMNameOSTypeCommon::guessOSTypeDetectedOSTypeString(m_pNameAndSystemEditor, pWizard->detectedOSTypeId()))
+    bool const fOsTypeFixed = UIWizardNewVMNameOSTypeCommon::guessOSTypeDetectedOSTypeString(m_pNameAndSystemEditor,
+                                                                                             pWizard->detectedOSTypeId());
+    if (fOsTypeFixed)
         m_userModifiedParameters << "GuestOSTypeFromISO";
-    else /* Remove GuestOSTypeFromISO fromthe set if it is there: */
+    else /* Remove GuestOSTypeFromISO from the set if it is there: */
         m_userModifiedParameters.remove("GuestOSTypeFromISO");
 
@@ -619 +621 @@
     /* Disable OS type selector(s) to prevent user from changing guest OS type manually: */
     if (m_pNameAndSystemEditor)
-        m_pNameAndSystemEditor->setOSTypeStuffEnabled(pWizard->detectedOSTypeId().isEmpty());
+    {
+        m_pNameAndSystemEditor->setOSTypeStuffEnabled(fOsTypeFixed);
+
+        /* Redetect the OS type using the name if detection or the step above failed: */
+        if (!fOsTypeFixed)
+            sltNameChanged(m_pNameAndSystemEditor->name());
+    }
 
     emit completeChanged();