Changeset 83095 in vbox

Timestamp:

Feb 17, 2020 12:38:51 PM (5 years ago)

Author:

vboxsync

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

136152

Message:

FE/Qt: bugref:9653: VirtualBox Manager: Acquire current cloud machine state after pause/resume call async way as well; s.a. r136105 and r136151.

Location:

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

Files:

• UIVirtualMachineItemCloud.cpp (modified) (5 diffs)
• UIVirtualMachineItemCloud.h (modified) (1 diff)
• chooser/UIChooserAbstractModel.cpp (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/manager/UIVirtualMachineItemCloud.cpp

@@ -216 +216 @@
     , m_pCloudMachine(0)
     , m_enmFakeCloudItemState(FakeCloudItemState_Loading)
+    , m_pTask(0)
 {
     recache();
@@ -224 +225 @@
     , m_pCloudMachine(new UICloudMachine(guiCloudMachine))
     , m_enmFakeCloudItemState(FakeCloudItemState_NotApplicable)
+    , m_pTask(0)
 {
     recache();
@@ -290 +292 @@
             msgCenter().cannotAcquireCloudClientParameter(comProgress);
         else
-            updateState(pParent);
+            updateStateAsync(false /* delayed? */);
     }
 }
@@ -478 +480 @@
     AssertPtrReturnVoid(m_pCloudMachine);
 
-    /* Create and start task to acquire state async way: */
-    UITask *pTask = new UITaskGetCloudInstanceState(m_pCloudMachine->client(), m_strId);
-    connect(pTask, &UITask::sigComplete,
-            this, &UIVirtualMachineItemCloud::sltHandleGetCloudInstanceStateDone);
-    uiCommon().threadPool()->enqueueTask(pTask);
+    /* Create and start task to acquire state async way only if there is no task yet: */
+    if (!m_pTask)
+    {
+        m_pTask = new UITaskGetCloudInstanceState(m_pCloudMachine->client(), m_strId);
+        connect(m_pTask, &UITask::sigComplete,
+                this, &UIVirtualMachineItemCloud::sltHandleGetCloudInstanceStateDone);
+        uiCommon().threadPool()->enqueueTask(m_pTask);
+    }
 }
 
@@ -488 +493 @@
 {
     /* Skip unrelated tasks: */
-    if (!pTask || pTask->type() != UITask::Type_GetCloudInstanceState)
+    if (!m_pTask || pTask != m_pTask)
         return;
+
+    /* Mark our task handled: */
+    m_pTask = 0;
 
     /* Cast task to corresponding sub-class: */

trunk/src/VBox/Frontends/VirtualBox/src/manager/UIVirtualMachineItemCloud.h

@@ -143 +143 @@
         /** Holds fake cloud item state. */
         FakeCloudItemState  m_enmFakeCloudItemState;
+
+        /** Holds the state acquire task instance. */
+        UITask *m_pTask;
     /** @} */
 };

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

@@ -312 +312 @@
 {
     UIVirtualMachineItem *pCache = qobject_cast<UIVirtualMachineItem*>(sender());
+    printf("UIChooserAbstractModel::sltHandleCloudMachineStateChange\n, id = %s\n", pCache->id().toUtf8().constData());
     AssertPtrReturnVoid(pCache);
     sigCloudMachineStateChange(pCache->id());