aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Sibiller <uli42@gmx.de>2020-11-24 22:23:38 +0100
committerUlrich Sibiller <uli42@gmx.de>2021-06-20 20:12:51 +0200
commitcf85c725889c92ba1aa0d506649362bbfcc111b6 (patch)
tree2740cd6f8514fa8e885949b72b6db9a07f456fd2
parent55f9c94b2b7672e1c4edc2bdcd14a8b892bb61eb (diff)
downloadnx-libs-cf85c725889c92ba1aa0d506649362bbfcc111b6.tar.gz
nx-libs-cf85c725889c92ba1aa0d506649362bbfcc111b6.tar.bz2
nx-libs-cf85c725889c92ba1aa0d506649362bbfcc111b6.zip
Clipboard.c: reset lastServer[].requestor on reconnect
-rw-r--r--nx-X11/programs/Xserver/hw/nxagent/Clipboard.c14
1 files 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);