aboutsummaryrefslogtreecommitdiff
path: root/nx-X11/programs
diff options
context:
space:
mode:
authorUlrich Sibiller <uli42@gmx.de>2020-09-23 12:17:18 +0200
committerUlrich Sibiller <uli42@gmx.de>2020-11-04 00:02:34 +0100
commitb07b6c537285c0182ef4fb6df17cf309d2bfc814 (patch)
tree82b46819faee467e408af8f4dbce2f29372b272d /nx-X11/programs
parent522eea6f2ce2a61ef965268e2d2ec5346bf6b30c (diff)
downloadnx-libs-b07b6c537285c0182ef4fb6df17cf309d2bfc814.tar.gz
nx-libs-b07b6c537285c0182ef4fb6df17cf309d2bfc814.tar.bz2
nx-libs-b07b6c537285c0182ef4fb6df17cf309d2bfc814.zip
Clipboard.c: fix bug in special optimization for nested settings
Fixes ArcticaProject/nx-libs#941
Diffstat (limited to 'nx-X11/programs')
-rw-r--r--nx-X11/programs/Xserver/hw/nxagent/Clipboard.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Clipboard.c b/nx-X11/programs/Xserver/hw/nxagent/Clipboard.c
index 0589d33bb..ceb47b669 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Clipboard.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Clipboard.c
@@ -2031,11 +2031,12 @@ int nxagentSendNotify(xEvent *event)
* communication happens completely between our own clients (some of
* which can be nxagents themselves). In that case we return 0 (tell
* dix to go on) and do nothing!
+ * Be sure to not let this trigger for the failure answer (property 0)
*/
- if (event->u.selectionNotify.property != clientCutProperty || lastServerRequestor == None)
+ if (!(event->u.selectionNotify.property == clientCutProperty || event->u.selectionNotify.property == 0) || lastServerRequestor == None)
{
#ifdef DEBUG
- fprintf(stderr, "%s: sent nothing.\n", __func__);
+ fprintf(stderr, "%s: sent nothing - message to real X server is not required.\n", __func__);
#endif
return 0;
}