From 57081e55fdb8a90488574b732793bf1056f4c6ab Mon Sep 17 00:00:00 2001
From: Ulrich Sibiller <uli42@gmx.de>
Date: Mon, 13 Mar 2017 20:27:50 +0100
Subject: Keystroke.c: fix code order
Do not use map before calling parse_keystroke_file() since it will malloc map.
---
nx-X11/programs/Xserver/hw/nxagent/Keystroke.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
(limited to 'nx-X11/programs')
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Keystroke.c b/nx-X11/programs/Xserver/hw/nxagent/Keystroke.c
index 9165a057a..501eea8b0 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Keystroke.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Keystroke.c
@@ -400,12 +400,14 @@ static enum nxagentSpecialKeystroke find_keystroke(XKeyEvent *X)
{
enum nxagentSpecialKeystroke ret = KEYSTROKE_NOTHING;
int keysyms_per_keycode_return;
- struct nxagentSpecialKeystrokeMap *cur = map;
+ struct nxagentSpecialKeystrokeMap *cur;
/* FIXME: we do late parsing here, this should be done at startup,
not at first keypress! */
parse_keystroke_file();
+ cur = map;
+
XlibKeySym *keysym = XGetKeyboardMapping(nxagentDisplay,
X->keycode,
1,
--
cgit v1.2.3