Changeset 86804 in vbox for trunk/src/VBox/Frontends/VirtualBox

Timestamp:

Nov 3, 2020 8:16:05 PM (4 years ago)

Author:

vboxsync

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

141237

Message:

FE/Qt: bugref:9653: VirtualBox Manager: Chooser pane: While uninstalling cloud provider we should stop profile refresh tasks as well as we already do for machine refresh tasks.

File:

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

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

@@ -723 +723 @@
 void UIChooserAbstractModel::sltHandleCloudProviderUninstall(const QUuid &uProviderId)
 {
-    /* We should stop cloud machine updates currently being performed: */
+    /* We should stop cloud entity updates currently being performed: */
     foreach (const UICloudEntityKey &key, m_cloudEntityKeysBeingUpdated)
     {
-        /* Skip unrelated keys: */
+        /* For profiles: */
         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 task child by key: */
+            UIProgressTaskReadCloudMachineList *pTask = findChild<UIProgressTaskReadCloudMachineList*>(key.toString());
+            AssertPtrReturnVoid(pTask);
+
+            /* Wait for cloud profile refresh task to complete,
+             * then delete the task itself manually: */
+            pTask->cancel();
+            delete pTask;
+        }
+        /* For machines: */
+        else
+        {
+            /* 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,
+             * task itself will be deleted with the machine-node: */
+            pCloudMachineItem->waitForAsyncInfoUpdateFinished();
+        }
+    }
+
+    /* We haven't let tasks to unregister themselves
+     * so we have to cleanup task set ourselves: */
+    m_cloudEntityKeysBeingUpdated.clear();
 
     /* Search and delete corresponding cloud provider node if present: */
@@ -943 +960 @@
     if (pTask)
     {
+        /* It's easy to find child by name later: */
+        pTask->setObjectName(guiCloudProfileKey.toString());
+
         /* Insert cloud profile key into a list of keys currently being updated: */
         insertCloudEntityKey(guiCloudProfileKey);