Fix some local->remote clipboard merge misses

This commit is contained in:
Lauri Kasanen
2021-04-13 13:49:43 +03:00
parent a1cf454f06
commit 95d34f7e58
9 changed files with 22 additions and 19 deletions

View File

@@ -296,8 +296,10 @@ void SConnection::setEncodings(int nEncodings, const rdr::S32* encodings)
}
}
void SConnection::clientCutText(const char* str)
void SConnection::clientCutText(const char* str, int len)
{
hasLocalClipboard = false;
strFree(clientClipboard);
clientClipboard = NULL;
@@ -328,10 +330,12 @@ void SConnection::handleClipboardNotify(rdr::U32 flags)
strFree(clientClipboard);
clientClipboard = NULL;
if (flags & rfb::clipboardUTF8)
if (flags & rfb::clipboardUTF8) {
handleClipboardAnnounce(true);
else
hasLocalClipboard = false;
} else {
handleClipboardAnnounce(false);
}
}
void SConnection::handleClipboardProvide(rdr::U32 flags,