Changeset 34758 in vbox

Timestamp:

Dec 6, 2010 3:42:52 PM (14 years ago)

Author:

vboxsync

Message:

Automatic Guest Additions update/Main: Simplified overall progress error handling.

File:

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

trunk/src/VBox/Main/GuestImpl.cpp

@@ -480 +480 @@
     /* Clean up */
     aTask->rc = rc;
-    if (SUCCEEDED(   aTask->progress->COMGETTER(Completed(&fCompleted)))
-                  && !fCompleted)
-        aTask->progress->SetCurrentOperationProgress(99);
 
     if (   SUCCEEDED(aTask->progress->COMGETTER(Canceled(&fCanceled)))
-        && !fCanceled)
-    {
-        /* Task completed, regardless whether successful/failed. */
-
-        /* Assign data. */
-        if (rc == S_OK)
-        {
-            /* No data to assign yet. */
-        }
-
-        if (SUCCEEDED(   aTask->progress->COMGETTER(Completed(&fCompleted)))
-                      && !fCompleted)
-            aTask->progress->notifyComplete(rc);
-    }
-    else /* The task was canceled, set error code to prevent assertions. */
-    {
-        LogRel(("Guest Additions update was canceled\n"));
-        if (SUCCEEDED(   aTask->progress->COMGETTER(Completed(&fCompleted)))
-                      && !fCompleted)
-            aTask->progress->notifyComplete(VBOX_E_IPRT_ERROR,
+        && !fCanceled
+        && SUCCEEDED(aTask->progress->COMGETTER(Completed(&fCompleted)))
+        && !fCompleted)
+    {
+        if (FAILED(rc))
+        {
+            aTask->progress->notifyComplete(rc,
                                             COM_IIDOF(IGuest),
                                             Guest::getStaticComponentName(),
-                                            Guest::tr("Automatic Guest Additions update was canceled"));
+                                            rc == VBOX_E_NOT_SUPPORTED
+                                            ? Guest::tr("Automatic Guest Additions update not supported")
+                                            : Guest::tr("Automatic Guest Additions update failed"));
+        }
+        else
+            AssertMsgFailed(("Automatic Guest Additions update neither canceled nor completed and did *not* fail!? D'oh!\n"));
     }