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

Timestamp:

Oct 29, 2020 10:41:03 AM (4 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9653: VirtualBox Manager: Chooser pane: Cleanup extension pack uninstall logic, we should stop updates for all active cloud machines, not for selected only; This allows us to move that logic to abstract model as well.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/manager/chooser

Files:

• UIChooserAbstractModel.cpp (modified) (1 diff)
• UIChooserModel.cpp (modified) (1 diff)

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

@@ -764 +764 @@
 void UIChooserAbstractModel::sltHandleCloudProviderUninstall(const QUuid &uProviderId)
 {
+    /* We should stop cloud machine updates currently being performed: */
+    foreach (const UICloudEntityKey &key, m_cloudEntityKeysBeingUpdated)
+    {
+        /* Skip unrelated keys: */
+        if (key.m_uMachineId.isNull())
+            continue;
+
+        /* Search machine node: */
+        UIChooserNode *pNode = searchMachineNode(key.m_strProviderShortName, key.m_strProfileName, key.m_uMachineId);
+        AssertPtrReturnVoid(pNode);
+        /* Acquire cloud machine item: */
+        UIVirtualMachineItemCloud *pCloudMachineItem = pNode->toMachineNode()->cache()->toCloud();
+        AssertPtrReturnVoid(pCloudMachineItem);
+
+        /* Wait for cloud machine refresh task to complete: */
+        pCloudMachineItem->waitForAsyncInfoUpdateFinished();
+    }
+
     /* Search and delete corresponding cloud provider node if present: */
     delete searchProviderNode(uProviderId);

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

@@ -1131 +1131 @@
 void UIChooserModel::sltHandleCloudProviderUninstall(const QUuid &uProviderId)
 {
-    /* Search for selected cloud machine items: */
-    foreach (UIVirtualMachineItem *pItem, selectedMachineItems())
-    {
-        /* Skip unrelated nodes: */
-        AssertPtrReturnVoid(pItem);
-        UIVirtualMachineItemCloud *pCloudItem = pItem->toCloud();
-        if (!pCloudItem)
-            continue;
-
-        /* Wait for cloud machine refresh task to complete: */
-        pCloudItem->waitForAsyncInfoUpdateFinished();
-    }
-
     /* Call to base-class: */
     UIChooserAbstractModel::sltHandleCloudProviderUninstall(uProviderId);