Changeset 18394 in vbox for trunk/src/VBox/Main

Timestamp:

Mar 27, 2009 2:04:43 PM (16 years ago)

Author:

vboxsync

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

45190

Message:

Main: do not allow IProgress to report 100% until we're really done

File:

• trunk/src/VBox/Main/ProgressImpl.cpp (modified) (1 diff)

trunk/src/VBox/Main/ProgressImpl.cpp

@@ -271 +271 @@
     else
     {
-        /* global percent =
-         *      (100 / m_cOperations) * mOperation +
-         *      ((100 / m_cOperations) / 100) * m_ulOperationPercent */
-//         *aPercent = (100 * mOperation + m_ulOperationPercent) / m_cOperations;
-
-        *aPercent = (ULONG)(    (    (double)m_ulOperationsCompletedWeight                                              // weight of operations that have been completed
-                                   + ((double)m_ulOperationPercent * (double)m_ulCurrentOperationWeight / (double)100)  // plus partial weight of the current operation
-                                ) * (double)100 / (double)m_ulTotalOperationsWeight);
+        ULONG ulPercent = (ULONG)(    (    (double)m_ulOperationsCompletedWeight                                              // weight of operations that have been completed
+                                         + ((double)m_ulOperationPercent * (double)m_ulCurrentOperationWeight / (double)100)  // plus partial weight of the current operation
+                                      ) * (double)100 / (double)m_ulTotalOperationsWeight
+                                 );
+        // do not report 100% until we're really really done with everything as the Qt GUI dismisses progress dialogs in that case
+        if (    ulPercent == 100
+             && (    m_ulOperationPercent < 100
+                  || (m_ulCurrentOperation < m_cOperations -1)
+                )
+           )
+            *aPercent = 99;
+        else
+            *aPercent = ulPercent;
     }