Changeset 86779 in vbox

Timestamp:

Nov 2, 2020 11:35:12 AM (4 years ago)

Author:

vboxsync

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

141178

Message:

FE/Qt: bugref:9653: VirtualBox Manager: Chooser pane: Fixing regression done in r141164; Shouldn't cancel current refresh call when selection changed, only cancel subsequent calls.

Location:

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

Files:

• UIVirtualMachineItemCloud.cpp (modified) (1 diff)
• UIVirtualMachineItemCloud.h (modified) (1 diff)
• chooser/UIChooserItemMachine.cpp (modified) (1 diff)

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

@@ -144 +144 @@
 }
 
+void UIVirtualMachineItemCloud::stopAsyncUpdates()
+{
+    /* Ignore cancel request if progress-task is absent: */
+    if (!m_pProgressTaskRefresh)
+        return;
+
+    /* Mark update canceled in any case: */
+    m_fRefreshScheduled = false;
+}
+
 void UIVirtualMachineItemCloud::waitForAsyncInfoUpdateFinished()
 {

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

@@ -74 +74 @@
         QString fakeCloudItemErrorMessage() const { return m_strFakeCloudItemErrorMessage; }
 
-        /** Updates cloud VM info async way, @a fDelayed if requested or instant otherwise. */
+        /** Updates cloud VM info async way, @a fDelayed if requested or instant otherwise.
+          * @param  fSubscribe  Brings whether this update should be performed periodically. */
         void updateInfoAsync(bool fDelayed, bool fSubscribe = false);
+        /** Stop periodical updates previously requested. */
+        void stopAsyncUpdates();
         /** Makes sure async info update is finished.
           * @note  This method creates own event-loop to avoid blocking calling thread event processing,

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

@@ -235 +235 @@
             pCloudMachineItem->updateInfoAsync(false /* delayed? */, true /* subscribe */);
         else
-            pCloudMachineItem->waitForAsyncInfoUpdateFinished();
+            pCloudMachineItem->stopAsyncUpdates();
     }
 }