[X2Go-Commits] [nx-libs] 371/429: Clipboard.c: reset lastServer[].requestor on reconnect
git-admin at x2go.org
git-admin at x2go.org
Mon Oct 18 09:37:10 CEST 2021
This is an automated email from the git hooks/post-receive script.
x2go pushed a commit to branch 3.6.x
in repository nx-libs.
commit cf85c725889c92ba1aa0d506649362bbfcc111b6
Author: Ulrich Sibiller <uli42 at gmx.de>
Date: Tue Nov 24 22:23:38 2020 +0100
Clipboard.c: reset lastServer[].requestor on reconnect
---
nx-X11/programs/Xserver/hw/nxagent/Clipboard.c | 14 ++++++++++----
1 file changed, 10 insertions(+), 4 deletions(-)
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Clipboard.c b/nx-X11/programs/Xserver/hw/nxagent/Clipboard.c
index af6f16032..eeeb28bab 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Clipboard.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Clipboard.c
@@ -2989,11 +2989,17 @@ Bool nxagentInitClipboard(WindowPtr pWin)
/* remSelAtoms have already been adjusted above */
XSetSelectionOwner(nxagentDisplay, remSelAtoms[index], serverWindow, CurrentTime);
}
+
+ /*
+ * On reconnect there cannot be any external requestor
+ * waiting for a reply so clean this
+ */
+ lastServers[index].requestor = None;
+
/*
- * FIXME: Shouldn't we reset lastServers[index].* and
- * lastClients[index].* here? Problem is that (internal)
- * clients might still be waiting for answers. Should reply
- * with failure then
+ * FIXME: We should reset lastClients[index].* here! Problem
+ * is that internal clients might still be waiting for
+ * answers. Should reply with failure then.
*/
invalidateTargetCache(index);
--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/nx-libs.git
More information about the x2go-commits
mailing list