From 289ac3dfd3b0f9bcefff15eb80dd04dccb0a1051 Mon Sep 17 00:00:00 2001 From: Ulrich Sibiller Date: Fri, 18 Jun 2021 00:21:41 +0200 Subject: Clipboard.c: remove superflous check replyPendingRequestSelectionToXServer already checks for None --- nx-X11/programs/Xserver/hw/nxagent/Clipboard.c | 20 ++++++-------------- 1 file changed, 6 insertions(+), 14 deletions(-) diff --git a/nx-X11/programs/Xserver/hw/nxagent/Clipboard.c b/nx-X11/programs/Xserver/hw/nxagent/Clipboard.c index 392943066..735a9379a 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Clipboard.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Clipboard.c @@ -2327,21 +2327,13 @@ static void setSelectionOwnerOnXServer(Selection *pSelection) lastSelectionOwner[index].lastTimeChanged); #endif - #if defined(TEST) || defined(DEBUG) - if (lastServers[index].requestor != None) - { - /* - * There's an X client on the real X server waiting for a - * reply. That reply will never come because now we are the - * owner so let's be fair and cancel that request. - */ - fprintf(stderr, "%s: WARNING! lastServers[%d].requestor window [0x%lx] already set. Cancelling pending request.\n", - __func__, index, lastServers[index].requestor); - replyPendingRequestSelectionToXServer(index, False); - /* Now we can go on. */ - } - #endif + /* + * There's an X client on the real X server waiting for a + * reply. That reply will never come because now we are the + * owner so let's be fair and cancel that request. + */ + replyPendingRequestSelectionToXServer(index, False); /* * Inform the real X server that our serverWindow is the -- cgit v1.2.3