[X2Go-Commits] [nx-libs] 70/429: Clipboard.c: fix bug in special optimization for nested settings

[git-admin at x2go.org]

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 b07b6c537285c0182ef4fb6df17cf309d2bfc814
Author: Ulrich Sibiller <uli42 at gmx.de>
Date:   Wed Sep 23 12:17:18 2020 +0200

    Clipboard.c: fix bug in special optimization for nested settings
    
    Fixes ArcticaProject/nx-libs#941
---
 nx-X11/programs/Xserver/hw/nxagent/Clipboard.c | 5 +++--
 1 file 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;
   }

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/nx-libs.git