diff options
author | Pierre Ossman <ossman@cendio.se> | 2021-02-03 09:35:44 +0100 |
---|---|---|
committer | Pierre Ossman <ossman@cendio.se> | 2021-02-03 09:35:44 +0100 |
commit | 35b4eedc879ff2f02995a03736dedda5d41547f1 (patch) | |
tree | f0457f64c45ce75d04768a9290bcee0e25245059 /common/rfb/VNCServerST.cxx | |
parent | 7f56b5481cfff360fb44bc6cce2ca60c6dabebde (diff) | |
parent | 49122f6dccd836f0a4618247895fd4c5b8db7af0 (diff) | |
download | tigervnc-35b4eedc879ff2f02995a03736dedda5d41547f1.tar.gz tigervnc-35b4eedc879ff2f02995a03736dedda5d41547f1.zip |
Merge branch 'autoclip' of https://github.com/CendioOssman/tigervnc
Diffstat (limited to 'common/rfb/VNCServerST.cxx')
-rw-r--r-- | common/rfb/VNCServerST.cxx | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/common/rfb/VNCServerST.cxx b/common/rfb/VNCServerST.cxx index 85368afe..b32cac59 100644 --- a/common/rfb/VNCServerST.cxx +++ b/common/rfb/VNCServerST.cxx @@ -171,7 +171,7 @@ void VNCServerST::removeSocket(network::Socket* sock) { if (pointerClient == *ci) pointerClient = NULL; if (clipboardClient == *ci) - clipboardClient = NULL; + handleClipboardAnnounce(*ci, false); clipboardRequestors.remove(*ci); CharArray name(strDup((*ci)->getPeerEndpoint())); @@ -517,8 +517,10 @@ void VNCServerST::handleClipboardAnnounce(VNCSConnectionST* client, void VNCServerST::handleClipboardData(VNCSConnectionST* client, const char* data) { - if (client != clipboardClient) + if (client != clipboardClient) { + slog.debug("Ignoring unexpected clipboard data"); return; + } desktop->handleClipboardData(data); } |