Changeset 28640 in vbox

Timestamp:

Apr 23, 2010 12:48:11 PM (15 years ago)

Author:

vboxsync

Message:

Guest Control: Update (only complete progress once).

File:

• trunk/src/VBox/Main/GuestImpl.cpp (modified) (3 diffs)

trunk/src/VBox/Main/GuestImpl.cpp

@@ -535 +535 @@
 
             case PROC_STS_TEN: /* Terminated normally. */
-                it->pProgress->notifyComplete(S_OK);
+                if (!it->pProgress->getCompleted())
+                    it->pProgress->notifyComplete(S_OK);
                 break;
 
@@ -567 +568 @@
             && errMsg.length())
         {
-            it->pProgress->notifyComplete(E_FAIL /** @todo Find a better rc! */, COM_IIDOF(IGuest),
-                                          (CBSTR)Guest::getComponentName(), errMsg.c_str());
+            if (!it->pProgress->getCompleted())
+            {
+                it->pProgress->notifyComplete(E_FAIL /** @todo Find a better rc! */, COM_IIDOF(IGuest),
+                                              (CBSTR)Guest::getComponentName(), errMsg.c_str());
+                LogFlowFunc(("Callback (context ID=%u, status=%u) progress marked as completed\n",
+                             pData->hdr.u32ContextID, pData->u32Status));
+            }
+            else
+                LogFlowFunc(("Callback (context ID=%u, status=%u) progress already marked as completed\n", 
+                             pData->hdr.u32ContextID, pData->u32Status));
         }
         ASMAtomicWriteBool(&it->bCalled, true);
@@ -655 +664 @@
 
         /* Notify outstanding waits for progress ... */
-        if (!it->pProgress.isNull())
+        if (   !it->pProgress.isNull()
+            && !it->pProgress->getCompleted())
         {
             it->pProgress->notifyComplete(S_OK);