1 files changed, 9 insertions, 0 deletions
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Clipboard.c b/nx-X11/programs/Xserver/hw/nxagent/Clipboard.c
index 11c6ae013..fddb53b97 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Clipboard.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Clipboard.c
@@ -394,6 +394,15 @@ void nxagentDumpClipboardStat(void)
  */
 static void setClientSelectionStage(int stage)
 {
+  if (lastClientStage == stage)
+  {
+    #ifdef DEBUG
+    fprintf(stderr, "%s: selection stage already set to [%s] - doing nothing\n", __func__,
+	    getClientSelectionStageString(lastClientStage));
+    #endif
+    return;
+  }
+
   #ifdef DEBUG
   fprintf(stderr, "%s: Changing selection stage from [%s] to [%s]\n", __func__,
 	  getClientSelectionStageString(lastClientStage), getClientSelectionStageString(stage));