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

Timestamp:

Apr 30, 2010 10:21:00 AM (15 years ago)

Author:

vboxsync

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

60889

Message:

Guest Control/VBoxManage,Main: Immediate process output, now also cancelable with signal handling.

File:

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

trunk/src/VBox/Main/GuestImpl.cpp

@@ -478 +478 @@
         /** @todo Copy void* buffer contents! */
 
+        /* Was progress canceled before? */
+        BOOL fCancelled;
+        it->pProgress->COMGETTER(Canceled)(&fCancelled);
+
         /* Do progress handling. */
         Utf8Str errMsg;
@@ -487 +491 @@
 
             case PROC_STS_TEN: /* Terminated normally. */
-                if (!it->pProgress->getCompleted())
+                if (   !it->pProgress->getCompleted()
+                    && !fCancelled)
+                {
                     it->pProgress->notifyComplete(S_OK);
+                }
                 break;
 
@@ -542 +549 @@
             && errMsg.length())
         {
-            if (!it->pProgress->getCompleted())
+            if (   !it->pProgress->getCompleted()
+                && !fCancelled)
             {
                 it->pProgress->notifyComplete(E_FAIL /** @todo Find a better rc! */, COM_IIDOF(IGuest),
@@ -719 +727 @@
             rc = progress->init(static_cast<IGuest*>(this),
                                 BstrFmt(tr("Executing process")),
-                                FALSE);
+                                TRUE);
         }
         if (FAILED(rc)) return rc;