Merge pull request #5480 from akallabeth/xfreerdp_clip_fix
Fix broken clipboard after file copy
This commit is contained in:
commit
5e672d474e
@ -1438,7 +1438,6 @@ static UINT xf_cliprdr_server_format_data_response(CliprdrClientContext*
|
||||
return CHANNEL_RC_OK;
|
||||
}
|
||||
|
||||
DstSize = 0;
|
||||
pDstData = (BYTE*) ClipboardGetData(clipboard->system, dstFormatId, &DstSize);
|
||||
|
||||
if (!pDstData)
|
||||
@ -1446,7 +1445,6 @@ static UINT xf_cliprdr_server_format_data_response(CliprdrClientContext*
|
||||
WLog_WARN(TAG, "failed to get clipboard data in format %s [source format %s]",
|
||||
ClipboardGetFormatName(clipboard->system, dstFormatId),
|
||||
ClipboardGetFormatName(clipboard->system, srcFormatId));
|
||||
return CHANNEL_RC_OK;
|
||||
}
|
||||
|
||||
if (nullTerminated)
|
||||
|
@ -468,7 +468,8 @@ void* ClipboardGetData(wClipboard* clipboard, UINT32 formatId, UINT32* pSize)
|
||||
DstSize = SrcSize;
|
||||
pDstData = synthesizer->pfnSynthesize(clipboard, format->formatId, pSrcData,
|
||||
&DstSize);
|
||||
*pSize = DstSize;
|
||||
if (pDstData)
|
||||
*pSize = DstSize;
|
||||
}
|
||||
|
||||
return pDstData;
|
||||
|
Loading…
Reference in New Issue
Block a user