diff options
| author | Ulrich Sibiller <uli42@gmx.de> | 2017-03-13 21:14:20 +0100 |
|---|---|---|
| committer | Ulrich Sibiller <uli42@gmx.de> | 2017-03-13 22:17:42 +0100 |
| commit | 8f2679abc6910155fa2e5ddeb54cd7cfd4dcf17f (patch) | |
| tree | 80663a92e1085cfad795d036513dc93370ab0a14 | |
| parent | 3042c5064b0bde6e27ed010386d7941deb83179e (diff) | |
| download | nx-libs-8f2679abc6910155fa2e5ddeb54cd7cfd4dcf17f.tar.gz nx-libs-8f2679abc6910155fa2e5ddeb54cd7cfd4dcf17f.tar.bz2 nx-libs-8f2679abc6910155fa2e5ddeb54cd7cfd4dcf17f.zip | |
Keystroke.c: make nxagentKeystrokeFileParsed local
| -rw-r--r-- | nx-X11/programs/Xserver/hw/nxagent/Keystroke.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Keystroke.c b/nx-X11/programs/Xserver/hw/nxagent/Keystroke.c index 55936db6d..f655e3b95 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Keystroke.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Keystroke.c @@ -45,7 +45,6 @@ extern Bool nxagentWMIsRunning; extern Bool nxagentIpaq; extern char *nxagentKeystrokeFile; -Bool nxagentKeystrokeFileParsed = False; #ifdef NX_DEBUG_INPUT int nxagentDebugInputDevices = 0; @@ -254,10 +253,12 @@ static void parse_keystroke_file(void) char *homefile = "/.nx/config/keystrokes.cfg"; char *etcfile = "/etc/nxagent/keystrokes.cfg"; - if (nxagentKeystrokeFileParsed) + /* used for tracking if the config file parsing has already been + done (regardless of the result) */ + static Bool done = False; + if (done) return; - - nxagentKeystrokeFileParsed = True; + done = True; if (nxagentX2go) { homefile = "/.x2go/config/keystrokes.cfg"; |