Changeset 29924 in vbox

Timestamp:

May 31, 2010 6:30:29 PM (15 years ago)

Author:

vboxsync

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

62191

Message:

Progress.cpp: Don't assert in SetNextOperation if the object is canceled already since it is an external factor that we cannot control.

File:

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

trunk/src/VBox/Main/ProgressImpl.cpp

@@ -1009 +1009 @@
     AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
 
-    AssertReturn(!mCompleted && !mCanceled, E_FAIL);
+    if (mCanceled)
+        return E_FAIL;
+    AssertReturn(!mCompleted, E_FAIL);
     AssertReturn(m_ulCurrentOperation + 1 < m_cOperations, E_FAIL);