1 files changed, 2 insertions, 7 deletions
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Events.c b/nx-X11/programs/Xserver/hw/nxagent/Events.c
index e9de1450d..cbdf17a22 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Events.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Events.c
@@ -944,7 +944,7 @@ void nxagentDispatchEvents(PredicateFuncPtr predicate)
         fprintf(stderr, "nxagentDispatchEvents: Going to handle new SelectionNotify event.\n");
         #endif
 
-        nxagentNotifySelection(&X);
+        nxagentHandleSelectionNotifyFromXServer(&X);
 
         break;
       }
@@ -2933,12 +2933,7 @@ int nxagentHandleXFixesSelectionNotify(XEvent *X)
 
   if (SelectionCallback)
   {
-    int i = 0;
-
-    while ((i < NumCurrentSelections) &&
-            CurrentSelections[i].selection != local)
-      i++;
-
+    int i = nxagentFindCurrentSelectionIndex(local);
     if (i < NumCurrentSelections)
     {
       SelectionInfoRec    info;