[X2Go-Commits] [nx-libs] 418/429: Clipboard.c: Only take full clipboard clearing action if non-empty

[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 65d29df13fc4c955ddf60a200d41d8be7283c505
Author: Ulrich Sibiller <uli42 at gmx.de>
Date:   Sun Jun 20 12:58:04 2021 +0200

    Clipboard.c: Only take full clipboard clearing action if non-empty
---
 nx-X11/programs/Xserver/hw/nxagent/Clipboard.c | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/nx-X11/programs/Xserver/hw/nxagent/Clipboard.c b/nx-X11/programs/Xserver/hw/nxagent/Clipboard.c
index 85ef1ae16..09c7eb2c2 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Clipboard.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Clipboard.c
@@ -912,21 +912,21 @@ void nxagentHandleSelectionClearFromXServer(XEvent *X)
       x.u.selectionClear.atom = CurrentSelections[index].selection;
 
       sendEventToClient(lastSelectionOwner[index].client, &x);
-    }
 
-    /*
-     * Set the root window with the NullClient as selection owner. Our
-     * clients asking for the owner via XGetSelectionOwner() will get
-     * these for an answer.
-     */
-    CurrentSelections[index].window = screenInfo.screens[0]->root->drawable.id;
-    CurrentSelections[index].client = NullClient;
+      /*
+       * Set the root window with the NullClient as selection owner. Our
+       * clients asking for the owner via XGetSelectionOwner() will get
+       * this for an answer.
+       */
+      CurrentSelections[index].window = screenInfo.screens[0]->root->drawable.id;
+      CurrentSelections[index].client = NullClient;
 
-    clearSelectionOwnerData(index);
+      clearSelectionOwnerData(index);
 
-    setClientSelectionStage(index, SelectionStageNone);
+      setClientSelectionStage(index, SelectionStageNone);
 
-    invalidateTargetCache(index);
+      invalidateTargetCache(index);
+    }
   }
 }
 

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