From: Pierre Ossman <ossman@cendio.se>
Date: Wed, 3 Feb 2021 08:35:44 +0000 (+0100)
Subject: Merge branch 'autoclip' of https://github.com/CendioOssman/tigervnc
X-Git-Tag: v1.11.90~69
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=35b4eedc879ff2f02995a03736dedda5d41547f1;p=tigervnc.git

Merge branch 'autoclip' of https://github.com/CendioOssman/tigervnc
---

35b4eedc879ff2f02995a03736dedda5d41547f1
diff --cc common/rfb/SConnection.cxx
index 1c9ca3e7,683d29b6..8277844c
--- a/common/rfb/SConnection.cxx
+++ b/common/rfb/SConnection.cxx
@@@ -51,10 -51,11 +51,11 @@@ const SConnection::AccessRights SConnec
  
  SConnection::SConnection()
    : readyForSetColourMapEntries(false),
 -    is(0), os(0), reader_(0), writer_(0),
 -    ssecurity(0), state_(RFBSTATE_UNINITIALISED),
 -    preferredEncoding(encodingRaw),
 +    is(0), os(0), reader_(0), writer_(0), ssecurity(0),
 +    authFailureTimer(this, &SConnection::handleAuthFailureTimeout),
 +    state_(RFBSTATE_UNINITIALISED), preferredEncoding(encodingRaw),
-     clientClipboard(NULL), hasLocalClipboard(false)
+     clientClipboard(NULL), hasLocalClipboard(false),
+     unsolicitedClipboardAttempt(false)
  {
    defaultMajorVersion = 3;
    defaultMinorVersion = 8;
diff --cc common/rfb/VNCServerST.cxx
index 85368afe,ae51a61b..b32cac59
--- a/common/rfb/VNCServerST.cxx
+++ b/common/rfb/VNCServerST.cxx
@@@ -171,11 -169,9 +171,11 @@@ void VNCServerST::removeSocket(network:
        if (pointerClient == *ci)
          pointerClient = NULL;
        if (clipboardClient == *ci)
-         clipboardClient = NULL;
+         handleClipboardAnnounce(*ci, false);
        clipboardRequestors.remove(*ci);
  
 +      CharArray name(strDup((*ci)->getPeerEndpoint()));
 +
        // - Delete the per-Socket resources
        delete *ci;