Clipboard.c: do not send notify when pointer is NULL

There was only one place where this was checked but we check it always.

Clipboard.c: do not send notify when pointer is NULL
f14e8007 · Ulrich Sibiller · Mike Gabriel · 3a3a3373 · f14e8007
Commit f14e8007 authored Aug 03, 2019 by Ulrich Sibiller Committed by Mike Gabriel Sep 29, 2019
Hide whitespace changes
Inline Side-by-side

Showing with 9 additions and 4 deletions

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

No files found.
--- a/nx-X11/programs/Xserver/hw/nxagent/Clipboard.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Clipboard.c
@@ -714,6 +714,14 @@ FIXME: Do we need this?

 void nxagentSendSelectionNotify(Atom property)
 {
+  if (lastClientClientPtr == NULL)
+  {
+    #ifdef DEBUG
+    fprintf(stderr, "%s: lastClientClientPtr is NULL - doing nothing.\n", __func__);
+    #endif
+    return;
+  }
+
  xEvent x;

  #ifdef DEBUG
@@ -920,10 +928,7 @@ void nxagentCollectPropertyEvent(int resource)
    fprintf (stderr, "%s: WARNING! Invalid property value.\n", __func__);
    #endif

-    if (lastClientClientPtr != NULL)
-    {
-      nxagentSendSelectionNotify(None);
-    }
+    nxagentSendSelectionNotify(None);

    lastClientWindowPtr = NULL;
    SetClientSelectionStage(None);