aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Sibiller <uli42@gmx.de>2019-11-17 18:56:54 +0100
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2020-01-05 23:36:02 +0100
commitf05a2eca579e17c8d7d0b3327e794d1f615e432a (patch)
treec4204cceeec2fb16e3bf9985f4b3b932a097b3cc
parentb2af0c68602652b8d35a1d303eaa0a9a41285a2e (diff)
downloadnx-libs-f05a2eca579e17c8d7d0b3327e794d1f615e432a.tar.gz
nx-libs-f05a2eca579e17c8d7d0b3327e794d1f615e432a.tar.bz2
nx-libs-f05a2eca579e17c8d7d0b3327e794d1f615e432a.zip
Clipboard.c: fix timeout comparison
We had comparisions for >5000 and <5000, but =5000 was not explicitly handled. In that case the code took an unexpected path.
-rw-r--r--nx-X11/programs/Xserver/hw/nxagent/Clipboard.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Clipboard.c b/nx-X11/programs/Xserver/hw/nxagent/Clipboard.c
index 2b8a6f9b0..3a5488d18 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Clipboard.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Clipboard.c
@@ -1698,7 +1698,7 @@ int nxagentConvertSelection(ClientPtr client, WindowPtr pWin, Atom selection,
fprintf(stderr, "%s: lastClientWindowPtr != NULL.\n", __func__);
#endif
- if ((GetTimeInMillis() - lastClientReqTime) > 5000)
+ if ((GetTimeInMillis() - lastClientReqTime) >= 5000)
{
#ifdef DEBUG
fprintf(stderr, "%s: timeout expired on last request, "
@@ -1858,7 +1858,7 @@ int nxagentConvertSelection(ClientPtr client, WindowPtr pWin, Atom selection,
lastClientTarget = target;
/* if the last client request time is more than 5s ago update it. Why? */
- if ((GetTimeInMillis() - lastClientReqTime) > 5000)
+ if ((GetTimeInMillis() - lastClientReqTime) >= 5000)
lastClientReqTime = GetTimeInMillis();
if (selection == MakeAtom("CLIPBOARD", 9, 0))