github/FreeRDP
7
0
Fork 0
mirror of https://github.com/FreeRDP/FreeRDP.git synced 2025-06-03 00:00:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

[client,x11] fixed clipboard data cache

Browse Source 
clean only cached data not the fuse cache if other formats are requested
This commit is contained in:
akallabeth 2023-02-24 09:27:27 +01:00 committed by akallabeth
parent 1ba8d826f8
commit ae8f7c272d
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
client/X11/xf_cliprdr.c
View File

@ -1395,11 +1395,11 @@ static BOOL xf_cliprdr_process_selection_request(xfClipboard* clipboard,
else else
{ {
WINPR_ASSERT(cformat); WINPR_ASSERT(cformat);
/** /**
* Send clipboard data request to the server. * Send clipboard data request to the server.
* Response will be postponed after receiving the data * Response will be postponed after receiving the data
*/ */
xf_cliprdr_clear_cached_data(clipboard);
respond->property = xevent->property; respond->property = xevent->property;
clipboard->respond = respond; clipboard->respond = respond;
clipboard->requestedFormat = cformat; clipboard->requestedFormat = cformat;
@ -2367,7 +2367,6 @@ xf_cliprdr_server_format_data_response(CliprdrClientContext* context,
if (!clipboard->respond) if (!clipboard->respond)
return CHANNEL_RC_OK; return CHANNEL_RC_OK;
xf_cliprdr_clear_cached_data(clipboard);
pDstData = NULL; pDstData = NULL;
DstSize = 0; DstSize = 0;
srcFormatId = 0; srcFormatId = 0;
@ -2478,6 +2477,9 @@ xf_cliprdr_server_format_data_response(CliprdrClientContext* context,
/* Cache converted and original data to avoid doing a possibly costly /* Cache converted and original data to avoid doing a possibly costly
* conversion again on subsequent requests */ * conversion again on subsequent requests */
free(clipboard->data);
free(clipboard->data_raw);
clipboard->data = pDstData; clipboard->data = pDstData;
clipboard->data_length = DstSize; clipboard->data_length = DstSize;
/* We have to copy the original data again, as pSrcData is now owned /* We have to copy the original data again, as pSrcData is now owned