- Timestamp:
- May 24, 2023 10:42:42 AM (16 months ago)
- Location:
- trunk/src/VBox
- Files:
-
- 2 edited
-
GuestHost/SharedClipboard/clipboard-x11.cpp (modified) (1 diff)
-
HostServices/SharedClipboard/VBoxSharedClipboardSvc-x11.cpp (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/VBox/GuestHost/SharedClipboard/clipboard-x11.cpp
r99564 r99953 1267 1267 1268 1268 LogFlowFunc(("pCtx=%p\n", pCtx)); 1269 1270 #ifdef VBOX_WITH_SHARED_CLIPBOARD_TRANSFERS_HTTP 1271 ShClTransferHttpServerDestroy(&pCtx->HttpCtx.HttpServer); 1272 #endif 1269 1273 1270 1274 #ifdef TESTCASE -
trunk/src/VBox/HostServices/SharedClipboard/VBoxSharedClipboardSvc-x11.cpp
r99937 r99953 505 505 RT_NOREF(pBackend); 506 506 #ifdef VBOX_WITH_SHARED_CLIPBOARD_TRANSFERS_HTTP 507 return ShClHttpTransferRegisterAndMaybeStart(&pClient->State.pCtx->X11.HttpCtx, pTransfer); 507 /* We only need to start the HTTP server (and register the transfer to it) when we actually receive data from the guest. */ 508 if (ShClTransferGetDir(pTransfer) == SHCLTRANSFERDIR_FROM_REMOTE) 509 return ShClHttpTransferRegisterAndMaybeStart(&pClient->State.pCtx->X11.HttpCtx, pTransfer); 508 510 #else 509 511 RT_NOREF(pClient, pTransfer); 510 512 #endif 511 return V ERR_NOT_IMPLEMENTED;513 return VINF_SUCCESS; 512 514 } 513 515 … … 516 518 RT_NOREF(pBackend); 517 519 #ifdef VBOX_WITH_SHARED_CLIPBOARD_TRANSFERS_HTTP 518 return ShClHttpTransferUnregisterAndMaybeStop(&pClient->State.pCtx->X11.HttpCtx, pTransfer); 520 /* See comment in ShClBackendTransferCreate(). */ 521 if (ShClTransferGetDir(pTransfer) == SHCLTRANSFERDIR_FROM_REMOTE) 522 return ShClHttpTransferUnregisterAndMaybeStop(&pClient->State.pCtx->X11.HttpCtx, pTransfer); 519 523 #else 520 524 RT_NOREF(pClient, pTransfer); 521 525 #endif 522 523 526 return VINF_SUCCESS; 524 527 }
Note:
See TracChangeset
for help on using the changeset viewer.

