1 files changed, 8 insertions, 16 deletions
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Keyboard.c b/nx-X11/programs/Xserver/hw/nxagent/Keyboard.c
index eea09a436..c2c36ad23 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Keyboard.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Keyboard.c
@@ -723,14 +723,6 @@ XkbError:
         fprintf(stderr, "nxagentKeyboardProc: XKB error.\n");
         #endif
 
-        if (xkb)
-        {
-            XkbFreeKeyboard(xkb, XkbAllComponentsMask, True);
-            xkb = NULL;
-        }
-
-        free(model);
-        free(layout);
 #endif
         XGetKeyboardControl(nxagentDisplay, &values);
 
@@ -863,16 +855,16 @@ XkbError:
         {
           NXShadowInitKeymap(&(pDev->key->curKeySyms));
         }
+      }
 
-        if (xkb)
-        {
-            XkbFreeKeyboard(xkb, XkbAllComponentsMask, True);
-            xkb = NULL;
-        }
-
-        free(model);
-        free(layout);
+      if (xkb)
+      {
+          XkbFreeKeyboard(xkb, XkbAllComponentsMask, True);
+          xkb = NULL;
       }
+
+      free(model);
+      free(layout);
 #endif
 
       #ifdef WATCH