1 files changed, 5 insertions, 14 deletions
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Keyboard.c b/nx-X11/programs/Xserver/hw/nxagent/Keyboard.c
index 20b68b563..5c35d7124 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Keyboard.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Keyboard.c
@@ -1691,10 +1691,14 @@ void nxagentWriteKeyboardFile(char *rules, char *model, char *layout, char *vari
 
 void nxagentKeycodeConversionSetup(void)
 {
+  nxagentKeycodeConversion = False;
+
+  if (nxagentXkbInfo.Opcode == -1)
+    return;
+
   if (nxagentOption(KeycodeConversion) == KeycodeConversionOff)
   {
     fprintf(stderr, "Info: Keycode conversion is off\n");
-    nxagentKeycodeConversion = False;
   }
   else if (nxagentOption(KeycodeConversion) == KeycodeConversionOn)
   {
@@ -1721,23 +1725,10 @@ void nxagentKeycodeConversionSetup(void)
       #endif
 
       fprintf(stderr, "Info: Keycode conversion auto-determined as off\n");
-      nxagentKeycodeConversion = False;
     }
   }
 }
 
-void nxagentResetKeycodeConversion(void)
-{
-  if (nxagentXkbInfo.Opcode != -1)
-  {
-    nxagentKeycodeConversionSetup();
-  }
-  else
-  {
-    nxagentKeycodeConversion = False;
-  }
-}
-
 Bool nxagentGetRemoteXkbExtension(void)
 {
   Bool result;