Changeset 85564 in vbox for trunk/src/VBox/Main/src-client/GuestDnDTargetImpl.cpp

Timestamp:

Jul 30, 2020 3:16:09 PM (4 years ago)

Author:

vboxsync

Message:

DnD/Main: Cleaned up error path handling a bit.

File:

• trunk/src/VBox/Main/src-client/GuestDnDTargetImpl.cpp (modified) (3 diffs)

trunk/src/VBox/Main/src-client/GuestDnDTargetImpl.cpp

@@ -795 +795 @@
 
     if (RT_FAILURE(rc))
+    {
         LogRel(("DnD: Sending data to guest failed with %Rrc\n", rc));
+        sendCancel();
+    }
 
     /* Reset state. */
@@ -1486 +1489 @@
             rc2 = pCtx->pResp->setProgress(100, DND_PROGRESS_CANCELLED, VINF_SUCCESS);
             AssertRC(rc2);
+
+            /* Cancelling is not an error, just set success here. */
+            rc  = VINF_SUCCESS;
         }
         else if (rc != VERR_GSTDND_GUEST_ERROR) /* Guest-side error are already handled in the callback. */
@@ -1494 +1500 @@
             AssertRC(rc2);
         }
-
-        rc = VINF_SUCCESS; /* The error was handled by the setProgress() calls above. */
     }