[X2Go-Commits] [nx-libs] 360/429: Clipboard.c: fix transfer from agent to X server

[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 2d4b0f8464cd2b34e2ae0a8009715fcf027f9738
Author: Ulrich Sibiller <uli42 at gmx.de>
Date:   Thu Oct 29 23:19:39 2020 +0100

    Clipboard.c: fix transfer from agent to X server
    
    The code took the wrong path because of an insufficent check
---
 nx-X11/programs/Xserver/hw/nxagent/Clipboard.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/nx-X11/programs/Xserver/hw/nxagent/Clipboard.c b/nx-X11/programs/Xserver/hw/nxagent/Clipboard.c
index 3842df30e..86b960a42 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Clipboard.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Clipboard.c
@@ -1629,7 +1629,12 @@ void nxagentHandleSelectionNotifyFromXServer(XEvent *X)
 
   printClientSelectionStage(index);
 
-  if (lastClients[index].windowPtr != NULL)
+  /*
+   * if the property is serverTransFromAgentProperty this means we are
+   * transferring data FROM the agent TO the server.
+   */
+
+  if (X->xselection.property != serverTransFromAgentProperty && lastClients[index].windowPtr != NULL)
   {
     /*
      * We reach here after a paste inside the nxagent, triggered by

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