Changeset 103868 in vbox

Timestamp:

Mar 15, 2024 2:38:53 PM (12 months ago)

Author:

vboxsync

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

162239

Message:

FE/Qt: bugref:10384: Make sure restricted families and subtypes (missing in supported guest OS type list) are hidden in New VM wizard.

File:

• trunk/src/VBox/Frontends/VirtualBox/src/globals/UIGuestOSType.cpp (modified) (4 diffs)

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

@@ -134 +134 @@
                                   KPlatformArchitecture enmArch /* = KPlatformArchitecture_None */) const
 {
-    /* Return all families by default: */
-    if (enmArch == KPlatformArchitecture_None)
-        return m_guestOSFamilies;
-
     /* Otherwise we'll have to prepare list by arch type: */
     UIGuestOSTypeManager::UIGuestOSFamilyInfo families;
@@ -143 +139 @@
     {
         const KPlatformArchitecture enmCurrentArch = fi.m_enmArch;
-        if (   (enmCurrentArch == enmArch || enmCurrentArch == KPlatformArchitecture_None)
+        if (   (   enmCurrentArch == enmArch
+                || enmCurrentArch == KPlatformArchitecture_None
+                || enmArch == KPlatformArchitecture_None)
             && (fListAll || fi.m_fSupported))
             families << fi;
@@ -155 +153 @@
                                              KPlatformArchitecture enmArch /* = KPlatformArchitecture_None */) const
 {
-    /* Return all subtypes by default: */
-    if (enmArch == KPlatformArchitecture_None)
-        return m_guestOSSubtypes.value(strFamilyId);
-
     /* Otherwise we'll have to prepare list by arch type: */
     UIGuestOSSubtypeInfo subtypes;
@@ -164 +158 @@
     {
         const KPlatformArchitecture enmCurrentArch = si.m_enmArch;
-        if (   (enmCurrentArch == enmArch || enmCurrentArch == KPlatformArchitecture_None)
+        if (   (   enmCurrentArch == enmArch
+                || enmCurrentArch == KPlatformArchitecture_None
+                || enmArch == KPlatformArchitecture_None)
             && (fListAll || si.m_fSupported))
             subtypes << si;