Changeset 90698 in vbox

Timestamp:

Aug 16, 2021 2:15:08 PM (3 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:8161: VirtualBox Manager: Stop all cloud related updates before detaching COM stuff.

Location:

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

Files:

• UIChooserAbstractModel.cpp (modified) (3 diffs)
• UIChooserAbstractModel.h (modified) (1 diff)

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

@@ -721 +721 @@
 void UIChooserAbstractModel::sltHandleCloudProviderUninstall(const QUuid &uProviderId)
 {
-    /* We should stop cloud entity updates currently being performed: */
-    foreach (const UICloudEntityKey &key, m_cloudEntityKeysBeingUpdated)
-    {
-        /* For profiles: */
-        if (key.m_uMachineId.isNull())
-        {
-            /* 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();
+    /* First of all, stop all cloud updates: */
+    stopCloudUpdates();
 
     /* Search and delete corresponding cloud provider node if present: */
@@ -781 +749 @@
     delete m_pInvisibleRootNode;
     m_pInvisibleRootNode = 0;
+
+    /* Finally, stop all cloud updates: */
+    stopCloudUpdates();
 }
 
@@ -1857 +1828 @@
 }
 
+void UIChooserAbstractModel::stopCloudUpdates()
+{
+    /* Stop all cloud entity updates currently being performed: */
+    foreach (const UICloudEntityKey &key, m_cloudEntityKeysBeingUpdated)
+    {
+        /* For profiles: */
+        if (key.m_uMachineId.isNull())
+        {
+            /* 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();
+}
+
 
 #include "UIChooserAbstractModel.moc"

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

@@ -353 +353 @@
     /** @} */
 
+    /** @name Cloud update stuff.
+      * @{ */
+        /** Stops all cloud updates. */
+        void stopCloudUpdates();
+    /** @} */
+
     /** @name General stuff.
       * @{ */