Changeset 99979 in vbox for trunk/src/VBox

Timestamp:

May 25, 2023 11:52:28 AM (22 months ago)

Author:

vboxsync

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

157639

Message:

FE/Qt: bugref:10460. Make sure 64-bit OS type is selected in case it exists.

File:

• trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UINameAndSystemEditor.cpp (modified) (2 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UINameAndSystemEditor.cpp

@@ -391 +391 @@
     else if (m_strFamilyId == "Windows")
     {
-        QString strDefaultID = "Windows10";
-        if (ARCH_BITS == 64)
-            strDefaultID += "_64";
+        QString strDefaultID = "Windows10_64";
         const int iIndexWin10 = m_pComboType->findData(strDefaultID, TypeID);
         if (iIndexWin10 != -1)
@@ -401 +399 @@
     else if (m_strFamilyId == "Linux")
     {
-        QString strDefaultID = "Oracle";
-        if (ARCH_BITS == 64)
-            strDefaultID += "_64";
-        const int iIndexUbuntu = m_pComboType->findData(strDefaultID, TypeID);
-        if (iIndexUbuntu != -1)
-            m_pComboType->setCurrentIndex(iIndexUbuntu);
-    }
-    /* Else simply select the first one present: */
+        QString strDefaultID = "Oracle_64";
+        const int iIndexOracle = m_pComboType->findData(strDefaultID, TypeID);
+        if (iIndexOracle != -1)
+            m_pComboType->setCurrentIndex(iIndexOracle);
+    }
+    /* Else try to pick the first 64-bit one if it exists.: */
     else
-        m_pComboType->setCurrentIndex(0);
+    {
+       QString strDefaultID = "_64";
+       const int iIndex = m_pComboType->findData(strDefaultID, TypeID, Qt::MatchContains);
+       if (iIndex != -1)
+           m_pComboType->setCurrentIndex(iIndex);
+       else
+           m_pComboType->setCurrentIndex(0);
+    }
 
     /* Update all the stuff: */