Changeset 93454 in vbox for trunk/src/VBox

Timestamp:

Jan 27, 2022 9:39:26 AM (3 years ago)

Author:

vboxsync

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

149566

Message:

FE/Qt: bugref:9371. Some more fixes for detected OS type stuff.

Location:

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

Files:

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

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

@@ -148 +148 @@
     UIWizardNewVMNameOSTypeCommon::determineOSType(strISOPath, pWizard);
 
-    if (!pWizard->detectedOSTypeId().isEmpty() && !m_userModifiedParameters.contains("GuestOSType"))
+    if (!m_userModifiedParameters.contains("GuestOSType"))
         UIWizardNewVMNameOSTypeCommon::guessOSTypeDetectedOSTypeString(m_pNameAndSystemEditor, pWizard->detectedOSTypeId());
     pWizard->setISOFilePath(strISOPath);

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

@@ -178 +178 @@
 bool UIWizardNewVMNameOSTypeCommon::guessOSTypeFromName(UINameAndSystemEditor *pNameAndSystemEditor, QString strNewName)
 {
+    AssertReturn(pNameAndSystemEditor, false);
     /* Append default architecture bit-count (64/32) if not already in the name: */
     if (!strNewName.contains("32") && !strNewName.contains("64"))
@@ -193 +194 @@
         if (strNewName.contains(gs_OSTypePattern[i].pattern))
         {
-            if (pNameAndSystemEditor)
-                pNameAndSystemEditor->setType(uiCommon().vmGuestOSType(gs_OSTypePattern[i].pcstId));
+            pNameAndSystemEditor->setType(uiCommon().vmGuestOSType(gs_OSTypePattern[i].pcstId));
             return true;
         }
@@ -203 +203 @@
 bool UIWizardNewVMNameOSTypeCommon::guessOSTypeDetectedOSTypeString(UINameAndSystemEditor *pNameAndSystemEditor, QString strDetectedOSType)
 {
+    AssertReturn(pNameAndSystemEditor, false);
+    if (strDetectedOSType.isEmpty())
+        pNameAndSystemEditor->setType(uiCommon().vmGuestOSType("Other"));
     /* 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"))
@@ -212 +215 @@
         if (strDetectedOSType.contains(gs_OSTypePattern[i].pattern))
         {
-            if (pNameAndSystemEditor)
-                pNameAndSystemEditor->setType(uiCommon().vmGuestOSType(gs_OSTypePattern[i].pcstId));
+
+            pNameAndSystemEditor->setType(uiCommon().vmGuestOSType(gs_OSTypePattern[i].pcstId));
             return true;
         }
@@ -471 +474 @@
     UIWizardNewVMNameOSTypeCommon::determineOSType(strPath, pWizard);
 
-    if (!pWizard->detectedOSTypeId().isEmpty() && !m_userModifiedParameters.contains("GuestOSType"))
+    if (!m_userModifiedParameters.contains("GuestOSType"))
         UIWizardNewVMNameOSTypeCommon::guessOSTypeDetectedOSTypeString(m_pNameAndSystemEditor, pWizard->detectedOSTypeId());
     pWizard->setISOFilePath(strPath);