Keyboard.c: simplify even more: free stuff at one place

59524cd0 · Ulrich Sibiller · Mike Gabriel · b8ae794e · 59524cd0
Commit 59524cd0 authored Jul 18, 2018 by Ulrich Sibiller Committed by Mike Gabriel Nov 09, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 8 additions and 16 deletions

Keyboard.c nx-X11/programs/Xserver/hw/nxagent/Keyboard.c +8 -16

No files found.
--- 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