Changeset 99265 in vbox for trunk/src

Timestamp:

Apr 3, 2023 3:38:36 PM (22 months ago)

Author:

vboxsync

Message:

FE/Qt: bugref:6669: More accurate handling for Notification-center cleanup in Native wizard; We have to make sure all pending blocking operations finished.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• notificationcenter/UINotificationCenter.cpp (modified) (1 diff)
• notificationcenter/UINotificationCenter.h (modified) (2 diffs)
• wizards/UINativeWizard.cpp (modified) (2 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/notificationcenter/UINotificationCenter.cpp

@@ -290 +290 @@
 }
 
+bool UINotificationCenter::hasOperationsPending() const
+{
+    return m_pEventLoop;
+}
+
+void UINotificationCenter::abortOperations()
+{
+    m_pEventLoop->exit();
+    emit sigOperationsAborted();
+}
+
 void UINotificationCenter::retranslateUi()
 {

trunk/src/VBox/Frontends/VirtualBox/src/notificationcenter/UINotificationCenter.h

@@ -67 +67 @@
     void sigClose();
 
+    /** Notifies listener about all operations aborted. */
+    void sigOperationsAborted();
+
 public:
 
@@ -95 +98 @@
       * @note It's a blocking call finished by sltHandleProgressFinished(). */
     bool handleNow(UINotificationProgress *pProgress);
+    /** Returns whether center has blocking operation. */
+    bool hasOperationsPending() const;
+    /** Aborts blocking operations being performed. */
+    void abortOperations();
 
 protected:

trunk/src/VBox/Frontends/VirtualBox/src/wizards/UINativeWizard.cpp

@@ -289 +289 @@
         pEvent->ignore();
 
+        /* Let the notification-center abort blocking operations: */
+        if (m_pNotificationCenter->hasOperationsPending())
+            m_pNotificationCenter->abortOperations();
+        else
         /* Tell the listener to close us (once): */
         if (!m_fClosed)
@@ -589 +593 @@
     /* Prepare local notification-center: */
     m_pNotificationCenter = new UINotificationCenter(this);
+    if (m_pNotificationCenter)
+        connect(m_pNotificationCenter, &UINotificationCenter::sigOperationsAborted,
+                this, &UINativeWizard::close, Qt::QueuedConnection);
 }