Changeset 100637 in vbox for trunk

Timestamp:

Jul 18, 2023 4:12:28 PM (19 months ago)

Author:

vboxsync

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

158471

Message:

Shared Clipboard: Relaxed check of shClTransferCancelOrError() a bit, so that it can be called if already cancelled. bugref:9437

File:

• trunk/src/VBox/GuestHost/SharedClipboard/clipboard-transfers.cpp (modified) (1 diff)

trunk/src/VBox/GuestHost/SharedClipboard/clipboard-transfers.cpp

@@ -2258 +2258 @@
     shClTransferLock(pTransfer);
 
-    AssertMsgReturnStmt(pTransfer->State.enmStatus == SHCLTRANSFERSTATUS_STARTED,
-                        ("Wrong status (currently is %s)\n", ShClTransferStatusToStr(pTransfer->State.enmStatus)),
-                        shClTransferUnlock(pTransfer), VERR_WRONG_ORDER);
-
     int rc2;
-    if (rc == VERR_CANCELLED)
-    {
-        rc2 = shClTransferSetStatus(pTransfer, SHCLTRANSFERSTATUS_CANCELED);
-
-        if (pTransfer->Callbacks.pfnOnCompleted)
-            pTransfer->Callbacks.pfnOnCompleted(&pTransfer->CallbackCtx, VERR_CANCELLED);
-    }
-    else
-    {
-        rc2 = shClTransferSetStatus(pTransfer, SHCLTRANSFERSTATUS_ERROR);
-
-        if (pTransfer->Callbacks.pfnOnError)
-            pTransfer->Callbacks.pfnOnError(&pTransfer->CallbackCtx, rc);
-    }
+
+    if (pTransfer->State.enmStatus == SHCLTRANSFERSTATUS_STARTED)
+    {
+        if (rc == VERR_CANCELLED)
+        {
+            rc2 = shClTransferSetStatus(pTransfer, SHCLTRANSFERSTATUS_CANCELED);
+
+            if (pTransfer->Callbacks.pfnOnCompleted)
+                pTransfer->Callbacks.pfnOnCompleted(&pTransfer->CallbackCtx, VERR_CANCELLED);
+        }
+        else
+        {
+            rc2 = shClTransferSetStatus(pTransfer, SHCLTRANSFERSTATUS_ERROR);
+
+            if (pTransfer->Callbacks.pfnOnError)
+                pTransfer->Callbacks.pfnOnError(&pTransfer->CallbackCtx, rc);
+        }
+    }
+    else /* Nothing to do. */
+        rc2 = VINF_SUCCESS;
 
     shClTransferUnlock(pTransfer);