aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Sibiller <uli42@gmx.de>2019-12-16 22:17:02 +0100
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2020-01-05 23:36:02 +0100
commitee5cf733fed11c68db5d41f821e4e3b8f5296770 (patch)
tree310cc6b61b63e610d6f97b5c5c94e6a554e783c9
parent84382e916b69f3a00b636af6961aaa5b0ede8697 (diff)
downloadnx-libs-ee5cf733fed11c68db5d41f821e4e3b8f5296770.tar.gz
nx-libs-ee5cf733fed11c68db5d41f821e4e3b8f5296770.tar.bz2
nx-libs-ee5cf733fed11c68db5d41f821e4e3b8f5296770.zip
Clipboard.c: change order of if clause to better match the comment above it
-rw-r--r--nx-X11/programs/Xserver/hw/nxagent/Clipboard.c14
1 files changed, 8 insertions, 6 deletions
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Clipboard.c b/nx-X11/programs/Xserver/hw/nxagent/Clipboard.c
index 8cc00fca0..1aafeceaa 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Clipboard.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Clipboard.c
@@ -2011,9 +2011,15 @@ int nxagentSendNotify(xEvent *event)
* which can be nxagents themselves). In that case we return 0 (tell
* dix to go on) and do nothing!
*/
- if (event->u.selectionNotify.property == clientCutProperty && lastServerRequestor != None)
+ if (event->u.selectionNotify.property != clientCutProperty || lastServerRequestor == None)
+ {
+ #ifdef DEBUG
+ fprintf(stderr, "%s: sent nothing.\n", __func__);
+ #endif
+ return 0;
+ }
+ else
{
-
/*
* Setup selection notify event to real server.
*
@@ -2086,10 +2092,6 @@ int nxagentSendNotify(xEvent *event)
return 1;
}
- #ifdef DEBUG
- fprintf(stderr, "%s: sent nothing.\n", __func__);
- #endif
- return 0;
}
/*