1 files changed, 7 insertions, 3 deletions
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Window.c b/nx-X11/programs/Xserver/hw/nxagent/Window.c
index 982c88314..23e1d5452 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Window.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Window.c
@@ -3122,10 +3122,14 @@ static void nxagentReconfigureWindowCursor(void * param0, XID param1, void * dat
   WindowPtr pWin = (WindowPtr)param0;
   Bool *pBool = (Bool*)data_buffer;
   CursorPtr   pCursor;
-  ScreenPtr   pScreen = pWin -> drawable.pScreen;
+  ScreenPtr   pScreen;
 
-  if (!pWin || !*pBool || !(pCursor = wCursor(pWin)) ||
-          !(nxagentCursorPriv(pCursor, pScreen)))
+  if (!pWin || !*pBool || !(pCursor = wCursor(pWin)))
+    return;
+
+  pScreen = pWin -> drawable.pScreen;
+
+  if (!(nxagentCursorPriv(pCursor, pScreen)))
   {
     return;
   }