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

Timestamp:

Apr 22, 2020 3:07:59 PM (5 years ago)

Author:

vboxsync

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

137476

Message:

FE/Qt: bugref:9653: VirtualBox Manager: Chooser pane: Fixing assertion on cloud VM (un)registration.

File:

• trunk/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooserAbstractModel.cpp (modified) (2 diffs)

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

@@ -411 +411 @@
     /* Compose full group name: */
     const QString strGroupName = QString("/%1/%2").arg(strProviderShortName, strProfileName);
-
-    /* Existing VM unregistered? */
-    if (!fRegistered)
-    {
-        /* Remove machine-items with passed id: */
-        invisibleRoot()->removeAllNodes(uMachineId);
-    }
-    /* New VM registered? */
-    else
-    {
-        /* Add new machine-item: */
-        const CCloudMachine comMachine = cloudMachineById(strProviderShortName, strProfileName, uMachineId);
-        addCloudMachineIntoTheTree(strGroupName, comMachine, true /* make it visible */);
-    }
-
     /* Search for corresponding profile node: */
     QList<UIChooserNode*> profileNodes;
@@ -433 +418 @@
     UIChooserNodeGroup *pProfileNode = profileNodes.first()->toGroupNode();
     AssertPtrReturnVoid(pProfileNode);
-    /* If we are unregistering and there are no items left: */
-    if (!fRegistered && pProfileNode->nodes(UIChooserNodeType_Machine).isEmpty())
-    {
-        /* Add fake cloud VM item: */
-        UIChooserNodeMachine *pFakeNode = new UIChooserNodeMachine(pProfileNode /* parent */,
-                                                                   false /* favorite */,
-                                                                   0 /* position */);
-        AssertPtrReturnVoid(pFakeNode);
-        AssertReturnVoid(pFakeNode->cacheType() == UIVirtualMachineItemType_CloudFake);
-        pFakeNode->cache()->toCloud()->setFakeCloudItemState(UIFakeCloudVirtualMachineItemState_Done);
-        pFakeNode->cache()->toCloud()->recache();
-    }
-    /* If we are registering and there is at least one real item exists now: */
-    else if (fRegistered && !pProfileNode->nodes(UIChooserNodeType_Machine).isEmpty())
-    {
-        /* Search for corresponding fake node: */
+
+    /* Existing VM unregistered? */
+    if (!fRegistered)
+    {
+        /* Remove machine-items with passed id: */
+        invisibleRoot()->removeAllNodes(uMachineId);
+
+        /* If there are no items left: */
+        if (pProfileNode->nodes(UIChooserNodeType_Machine).isEmpty())
+        {
+            /* Add fake cloud VM item: */
+            UIChooserNodeMachine *pFakeNode = new UIChooserNodeMachine(pProfileNode /* parent */,
+                                                                       false /* favorite */,
+                                                                       0 /* position */);
+            AssertPtrReturnVoid(pFakeNode);
+            AssertReturnVoid(pFakeNode->cacheType() == UIVirtualMachineItemType_CloudFake);
+            pFakeNode->cache()->toCloud()->setFakeCloudItemState(UIFakeCloudVirtualMachineItemState_Done);
+            pFakeNode->cache()->toCloud()->recache();
+        }
+    }
+    /* New VM registered? */
+    else
+    {
+        /* Add new machine-item: */
+        const CCloudMachine comMachine = cloudMachineById(strProviderShortName, strProfileName, uMachineId);
+        addCloudMachineIntoTheTree(strGroupName, comMachine, true /* make it visible */);
+
+        /* Search for possible fake node: */
         QList<UIChooserNode*> fakeNodes;
         pProfileNode->searchForNodes(toOldStyleUuid(QUuid()), UIChooserItemSearchFlag_Machine | UIChooserItemSearchFlag_ExactId, fakeNodes);
-        /* Delete the only fake node: */
-        AssertReturnVoid(!fakeNodes.isEmpty());
-        delete fakeNodes.first();
+        /* Delete fake node if present: */
+        if (!fakeNodes.isEmpty())
+            delete fakeNodes.first();
     }
 }