Changeset 30612 in vbox for trunk/src/VBox/Main/GuestImpl.cpp

Timestamp:

Jul 5, 2010 12:56:54 PM (15 years ago)

Author:

vboxsync

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

63339

Message:

Guest Control/Main: Be safe here.

File:

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

trunk/src/VBox/Main/GuestImpl.cpp

@@ -700 +700 @@
         BOOL fCancelled;
         ComAssert(it->second.pProgress.isNotNull());
-        it->second.pProgress->COMGETTER(Canceled)(&fCancelled);
-
-        if (!fCancelled)
+        if (SUCCEEDED(it->second.pProgress->COMGETTER(Canceled)(&fCancelled) && fCancelled))
+        {
+            it->second.pProgress->notifyComplete(VBOX_E_IPRT_ERROR, COM_IIDOF(IGuest),
+                                                 (CBSTR)Guest::getComponentName(), Guest::tr("The output operation was cancelled"));
+        }
+        else
             it->second.pProgress->notifyComplete(S_OK);
-        else
-            it->second.pProgress->notifyComplete(VBOX_E_IPRT_ERROR, COM_IIDOF(IGuest),
-                                          (CBSTR)Guest::getComponentName(), Guest::tr("The output operation was cancelled"));
     }
     else