Changeset 103178 in vbox

Timestamp:

Feb 2, 2024 3:43:31 PM (12 months ago)

Author:

vboxsync

Message:

FE/Qt: bugref:10384: UIBootOrderEditor: Take into account that there can be less than 4 devices supported for certain platforms.

File:

• trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIBootOrderEditor.cpp (modified) (3 diffs)

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

@@ -349 +349 @@
 UIBootItemDataList UIBootDataTools::loadBootItems(const CMachine &comMachine)
 {
+    /* Acquire supported boot devices: */
     CPlatform comPlatform = comMachine.GetPlatform();
     const KPlatformArchitecture comArch = comPlatform.GetArchitecture();
     const CPlatformProperties comProperties = uiCommon().virtualBox().GetPlatformProperties(comArch);
     QVector<KDeviceType> possibleBootItems = comProperties.GetSupportedBootDevices();
-    const int iPossibleBootListSize = qMin((ULONG)4, comProperties.GetMaxBootPosition());
+    /* Limit the list to maximum boot position: */
+    int iPossibleBootListSize = qMin((ULONG)possibleBootItems.size(), comProperties.GetMaxBootPosition());
+    /* Limit the list to maximum 4 slots for the GUI: */
+    iPossibleBootListSize = qMin(4, iPossibleBootListSize);
+    /* Resize the possible list finally: */
     possibleBootItems.resize(iPossibleBootListSize);
 
@@ -359 +364 @@
     UIBootItemDataList bootItems;
 
-    /* Gather boot-items of current VM: */
+    /* Gather boot-items of current VM, they can be different from supported: */
     QList<KDeviceType> usedBootItems;
     for (int i = 1; i <= possibleBootItems.size(); ++i)
@@ -373 +378 @@
         }
     }
+
     /* Gather other unique boot-items: */
     for (int i = 0; i < possibleBootItems.size(); ++i)
     {
         const KDeviceType enmType = possibleBootItems.at(i);
-        if (!usedBootItems.contains(enmType))
+        if (   !usedBootItems.contains(enmType)
+            && enmType != KDeviceType_Null)
         {
             UIBootItemData data;