2 files changed, 2 insertions, 2 deletions
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Handlers.c b/nx-X11/programs/Xserver/hw/nxagent/Handlers.c
index b8c6ff18a..59f368e4f 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Handlers.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Handlers.c
@@ -222,7 +222,7 @@ void nxagentBlockHandler(void * data, struct timeval **timeout, void * mask)
 
   #ifdef TEST
 
-  if (nxagentLastWindowDestroyed == 1)
+  if (nxagentLastWindowDestroyed)
   {
     fprintf(stderr, "nxagentBlockHandler: Elapsed time [%lu].\n",
                 now - nxagentLastWindowDestroyedTime);
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Window.c b/nx-X11/programs/Xserver/hw/nxagent/Window.c
index 54e553338..a5f457796 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Window.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Window.c
@@ -643,7 +643,7 @@ Bool nxagentDestroyWindow(WindowPtr pWin)
   }
 
   if (nxagentOption(Rootless) && nxagentRootlessDialogPid == 0 &&
-          nxagentLastWindowDestroyed == False && nxagentSomeWindowsAreMapped() == False)
+          !nxagentLastWindowDestroyed && nxagentSomeWindowsAreMapped() == False)
   {
     #ifdef TEST
     fprintf(stderr, "nxagentDestroyWindow: Last mapped window as been destroyed.\n");