Changeset 77598 in vbox

Timestamp:

Mar 7, 2019 1:51:44 PM (6 years ago)

Author:

vboxsync

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

129225

Message:

FE/Qt: bugref:9241: VirtualBox Manager UI: Chooser pane: Fixing crash on all machine items removal from existing group (group being dismissed).

File:

• trunk/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooserModel.cpp (modified) (11 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooserModel.cpp

@@ -383 +383 @@
             {
                 pItem = navigationList().at(idxBefore);
-                if (!currentItems().contains(pItem))
+                if (!currentItems().contains(pItem) && pItem->type() == UIChooserItemType_Machine)
                     return pItem;
                 --idxBefore;
@@ -390 +390 @@
             {
                 pItem = navigationList().at(idxAfter);
-                if (!currentItems().contains(pItem))
+                if (!currentItems().contains(pItem) && pItem->type() == UIChooserItemType_Machine)
                     return pItem;
                 ++idxAfter;
@@ -705 +705 @@
             if (uId == m_uLastCreatedMachineId)
             {
-                setCurrentItem(root()->searchForItem(comMachine.GetName(),
-                                                     UIChooserItemSearchFlag_Machine |
-                                                     UIChooserItemSearchFlag_ExactName));
-            }
-        }
+            setCurrentItem(root()->searchForItem(comMachine.GetName(),
+                                                 UIChooserItemSearchFlag_Machine |
+                                                 UIChooserItemSearchFlag_ExactName));
+        }
+    }
     }
     /* Existing VM unregistered? */
@@ -970 +970 @@
 
     /* And update model: */
-    updateNavigation();
-    updateLayout();
-
-    /* Make sure at least one item selected after that: */
-    if (!currentItem() && !navigationList().isEmpty())
-        setCurrentItem(navigationList().first());
+        updateNavigation();
+        updateLayout();
+
+        /* Make sure at least one item selected after that: */
+        if (!currentItem() && !navigationList().isEmpty())
+            setCurrentItem(navigationList().first());
 
     /* Notify listeners about selection change: */
@@ -1004 +1004 @@
     QList<UIChooserItemMachine*> inaccessibleMachineItemList;
     UIChooserItemMachine::enumerateMachineItems(currentItems(), inaccessibleMachineItemList,
-                                                 UIChooserItemMachineEnumerationFlag_Unique |
-                                                 UIChooserItemMachineEnumerationFlag_Inaccessible);
+                                                UIChooserItemMachineEnumerationFlag_Unique |
+                                                UIChooserItemMachineEnumerationFlag_Inaccessible);
 
     /* For each machine-item: */
@@ -1611 +1611 @@
 
     /* Add all the approved machines we have into the group-tree: */
-    LogRelFlow(("UIChooserModel: Loading VMs...\n"));
+        LogRelFlow(("UIChooserModel: Loading VMs...\n"));
     foreach (CMachine machine, vboxGlobal().virtualBox().GetMachines())
-    {
+        {
         const QUuid uMachineID = machine.GetId();
-        if (!uMachineID.isNull() && gEDataManager->showMachineInSelectorChooser(uMachineID))
+            if (!uMachineID.isNull() && gEDataManager->showMachineInSelectorChooser(uMachineID))
             addMachineIntoTheTree(machine);
-    }
-    LogRelFlow(("UIChooserModel: VMs loaded.\n"));
-}
+        }
+        LogRelFlow(("UIChooserModel: VMs loaded.\n"));
+    }
 
 void UIChooserModel::addMachineIntoTheTree(const CMachine &machine, bool fMakeItVisible /* = false */)
@@ -1641 +1641 @@
         const QString strGroups = groupList.join(", ");
         LogRelFlow(("UIChooserModel:  VM {%s} has groups: {%s}.\n", strName.toUtf8().constData(),
-                                                                     strGroups.toUtf8().constData()));
+                                                                    strGroups.toUtf8().constData()));
         foreach (QString strGroup, groups)
         {
@@ -1649 +1649 @@
             /* Create machine-item with found group-item as parent: */
             LogRelFlow(("UIChooserModel:   Creating item for VM {%s} in group {%s}.\n", strName.toUtf8().constData(),
-                                                                                         strGroup.toUtf8().constData()));
+                                                                                        strGroup.toUtf8().constData()));
             createMachineItem(machine, getGroupItem(strGroup, root(), fMakeItVisible));
         }
@@ -1676 +1676 @@
         if (!pParent->isRoot())
             delete pParent;
-    }
-}
+            }
+        }
 
 bool UIChooserModel::isGlobalItemFavorite(UIChooserItem *pParentItem) const
@@ -1734 +1734 @@
                         pFoundGroupItem->open(false);
                 return pFoundItem;
-            }
-        }
-    }
+        }
+    }
+}
 
     /* Found nothing? Creating: */
@@ -2072 +2072 @@
     foreach (UIChooserItem *pItem, pParentItem->items(UIChooserItemType_Machine))
         orders[strExtraDataKey] << QString("m=%1").arg(toOldStyleUuid(pItem->toMachineItem()->id()));
-}
+    }
 
 void UIChooserModel::makeSureGroupDefinitionsSaveIsFinished()