Clipboard.c: clear windowPtr in ClearSelectionOwner

There were two location where the windowPtr was not cleared after calling ClearSelectionOwner(). One was nxagentInitClipboard where it was set to NULL before and the second one was nxagentClearSelection() where it really should be reset. So we can safely move this to where it really belongs.

Clipboard.c: clear windowPtr in ClearSelectionOwner
c6aed6ad · Ulrich Sibiller · Mike Gabriel · 96bd8748 · c6aed6ad
Commit c6aed6ad authored Feb 13, 2020 by Ulrich Sibiller Committed by Mike Gabriel May 07, 2020
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 4 deletions

Clipboard.c nx-X11/programs/Xserver/hw/nxagent/Clipboard.c +1 -4

No files found.
--- a/nx-X11/programs/Xserver/hw/nxagent/Clipboard.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Clipboard.c
@@ -539,8 +539,8 @@ void nxagentClearSelectionOwner(int index)
 {
  lastSelectionOwner[index].client = NULL;
  lastSelectionOwner[index].window = None;
+  lastSelectionOwner[index].windowPtr = NULL;
  lastSelectionOwner[index].lastTimeChanged = GetTimeInMillis();
-  /* FIXME: why is windowPtr not cleared in the function? */
 }

 void nxagentStoreSelectionOwner(int index, Selection *sel)
@@ -579,9 +579,7 @@ void nxagentClearClipboard(ClientPtr pClient, WindowPtr pWindow)
                  (void *) pClient, (void *) pWindow);
      #endif

-      /* FIXME: why is windowPtr not cleared in the function? */
      nxagentClearSelectionOwner(i);
-      lastSelectionOwner[i].windowPtr = NULL;

      lastClientWindowPtr = NULL;
      SetClientSelectionStage(None);
@@ -1510,7 +1508,6 @@ void nxagentResetSelectionOwner(void)
    #endif

    nxagentClearSelectionOwner(i);
-    lastSelectionOwner[i].windowPtr = NULL;
  }

  lastClientWindowPtr = NULL;