Changeset 105523 in vbox for trunk/src/VBox/Frontends

Timestamp:

Jul 26, 2024 3:17:22 PM (6 months ago)

Author:

vboxsync

Message:

FE/Qt: bugref:10543: Make sure Guest OS Type Manager do not cache empty OS subtype (like for Windows etc).

File:

• trunk/src/VBox/Frontends/VirtualBox/src/globals/UIGuestOSType.cpp (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/globals/UIGuestOSType.cpp

@@ -198 +198 @@
     }
 
-    /* Cache or update subtype info: */
-    UISubtypeInfo si(strSubtype, enmArch, fSupported);
-    if (!m_guestOSSubtypes.contains(strFamilyId))
-        m_guestOSSubtypes[strFamilyId] << si;
-    else
-    {
-        UIGuestOSSubtypeInfo &subtypes = m_guestOSSubtypes[strFamilyId];
-        if (!subtypes.contains(si))
-            subtypes << si;
+    /* Cache or update subtype info (if it's not empty): */
+    if (!strSubtype.isEmpty())
+    {
+        UISubtypeInfo si(strSubtype, enmArch, fSupported);
+        if (!m_guestOSSubtypes.contains(strFamilyId))
+            m_guestOSSubtypes[strFamilyId] << si;
         else
         {
-            const int iIndex = subtypes.indexOf(si);
-            AssertReturnVoid(iIndex >= 0);
-            if (subtypes.at(iIndex).m_enmArch != enmArch)
-                subtypes[iIndex].m_enmArch = KPlatformArchitecture_None; // means any
-            if (subtypes.at(iIndex).m_fSupported != fSupported)
-                subtypes[iIndex].m_fSupported = true; // cause at least one is supported
+            UIGuestOSSubtypeInfo &subtypes = m_guestOSSubtypes[strFamilyId];
+            if (!subtypes.contains(si))
+                subtypes << si;
+            else
+            {
+                const int iIndex = subtypes.indexOf(si);
+                AssertReturnVoid(iIndex >= 0);
+                if (subtypes.at(iIndex).m_enmArch != enmArch)
+                    subtypes[iIndex].m_enmArch = KPlatformArchitecture_None; // means any
+                if (subtypes.at(iIndex).m_fSupported != fSupported)
+                    subtypes[iIndex].m_fSupported = true; // cause at least one is supported
+            }
         }
     }