Changeset 69005 in vbox

Timestamp:

Oct 6, 2017 2:37:28 PM (7 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:8674: A bit of rework for UIProgressDialog (part 5): Protect agains early finished or aborted progress (required for event handling only).

File:

• trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIProgressDialog.cpp (modified) (2 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIProgressDialog.cpp

@@ -90 +90 @@
 int UIProgressDialog::run(int cRefreshInterval)
 {
-    if (m_comProgress.isOk())
-    {
-        /* Start refresh timer: */
-        int id = startTimer(cRefreshInterval);
-
-        /* Set busy cursor.
-         * We don't do this on the Mac, cause regarding the design rules of
-         * Apple there is no busy window behavior. A window should always be
-         * responsive and it is in our case (We show the progress dialog bar). */
+    /* Make sure progress hasn't finished already: */
+    if (!m_comProgress.isOk() || m_comProgress.GetCompleted())
+    {
+        /* Progress completed? */
+        if (m_comProgress.isOk())
+            return Accepted;
+        /* Or aborted? */
+        else
+            return Rejected;
+    }
+
+    /* Start refresh timer: */
+    int id = startTimer(cRefreshInterval);
+
+    /* Set busy cursor.
+     * We don't do this on the Mac, cause regarding the design rules of
+     * Apple there is no busy window behavior. A window should always be
+     * responsive and it is in our case (We show the progress dialog bar). */
 #ifndef VBOX_WS_MAC
-        if (m_fCancelEnabled)
-            QApplication::setOverrideCursor(QCursor(Qt::BusyCursor));
-        else
-            QApplication::setOverrideCursor(QCursor(Qt::WaitCursor));
+    if (m_fCancelEnabled)
+        QApplication::setOverrideCursor(QCursor(Qt::BusyCursor));
+    else
+        QApplication::setOverrideCursor(QCursor(Qt::WaitCursor));
 #endif /* VBOX_WS_MAC */
 
-        /* Create a local event-loop: */
-        {
-            /* Guard ourself for the case
-             * we destroyed ourself in our event-loop: */
-            QPointer<UIProgressDialog> guard = this;
-
-            /* Holds the modal loop, but don't show the window immediately: */
-            execute(false);
-
-            /* Are we still valid? */
-            if (guard.isNull())
-                return Rejected;
-        }
-
-        /* Kill refresh timer: */
-        killTimer(id);
+    /* Create a local event-loop: */
+    {
+        /* Guard ourself for the case
+         * we destroyed ourself in our event-loop: */
+        QPointer<UIProgressDialog> guard = this;
+
+        /* Holds the modal loop, but don't show the window immediately: */
+        execute(false);
+
+        /* Are we still valid? */
+        if (guard.isNull())
+            return Rejected;
+    }
+
+    /* Kill refresh timer: */
+    killTimer(id);
 
 #ifndef VBOX_WS_MAC
-        /* Reset the busy cursor */
-        QApplication::restoreOverrideCursor();
+    /* Reset the busy cursor */
+    QApplication::restoreOverrideCursor();
 #endif /* VBOX_WS_MAC */
 
-        return result();
-    }
-    return Rejected;
+    return result();
 }
 
@@ -440 +447 @@
     {
         /* Set progress to 100%: */
-        m_pProgressBar->setValue(100);
+        updateProgressPercentage(100);
 
         /* Try to close the dialog: */