Changeset 84462 in vbox for trunk/src/VBox

Timestamp:

May 22, 2020 1:47:23 PM (5 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9653: VirtualBox Manager: Chooser pane: Prevent group being renamed to name already used by another VM, not only another group.

File:

• trunk/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooserItemGroup.cpp (modified) (1 diff)

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

@@ -936 +936 @@
     m_pNameEditorWidget->close();
 
-    /* Enumerate all the group names: */
-    QStringList groupNames;
-    foreach (UIChooserItem *pItem, parentItem()->items(UIChooserNodeType_Group))
+    /* Enumerate all the used machine and group names: */
+    QStringList usedNames;
+    foreach (UIChooserItem *pItem, parentItem()->items())
     {
         AssertPtrReturnVoid(pItem);
-        UIChooserItemGroup *pGroupItem = pItem->toGroupItem();
-        AssertPtrReturnVoid(pGroupItem);
-        if (pGroupItem->groupType() == UIChooserNodeGroupType_Local)
-            groupNames << pItem->name();
+        if (   pItem->type() == UIChooserNodeType_Machine
+            || (   pItem->type() == UIChooserNodeType_Group
+                && pItem->toGroupItem()->groupType() == UIChooserNodeGroupType_Local))
+            usedNames << pItem->name();
     }
     /* If proposed name is empty or not unique, reject it: */
     QString strNewName = m_pNameEditorWidget->text().trimmed();
-    if (strNewName.isEmpty() || groupNames.contains(strNewName))
+    if (strNewName.isEmpty() || usedNames.contains(strNewName))
         return;