aboutsummaryrefslogtreecommitdiff
path: root/nx-X11/programs/Xserver/hw/nxagent/Reconnect.c
diff options
context:
space:
mode:
authorUlrich Sibiller <uli42@gmx.de>2017-03-23 23:11:32 +0100
committerUlrich Sibiller <uli42@gmx.de>2017-04-03 21:28:11 +0200
commitba5183f80836042ce90be7dde29cc2c5f13baf9d (patch)
treee0187f5f783d6140969ac63ad4066dfafe3a30cf /nx-X11/programs/Xserver/hw/nxagent/Reconnect.c
parentf12012b15b2c761172ca863bb4b76383ec0b3ee5 (diff)
downloadnx-libs-ba5183f80836042ce90be7dde29cc2c5f13baf9d.tar.gz
nx-libs-ba5183f80836042ce90be7dde29cc2c5f13baf9d.tar.bz2
nx-libs-ba5183f80836042ce90be7dde29cc2c5f13baf9d.zip
Init keystrokes at startup and reconnect
no more late initialization
Diffstat (limited to 'nx-X11/programs/Xserver/hw/nxagent/Reconnect.c')
-rw-r--r--nx-X11/programs/Xserver/hw/nxagent/Reconnect.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Reconnect.c b/nx-X11/programs/Xserver/hw/nxagent/Reconnect.c
index ee21bff69..fb2303549 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Reconnect.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Reconnect.c
@@ -52,6 +52,7 @@
#include "Millis.h"
#include "Splash.h"
#include "Error.h"
+#include "Keystroke.h"
#ifdef XKB
#include "XKBsrv.h"
@@ -646,6 +647,10 @@ Bool nxagentReconnectSession(void)
goto nxagentReconnectError;
}
+ /* Re-read keystrokes definitions in case the keystrokes file has
+ changed while being supended */
+ nxagentInitKeystrokes(True);
+
#ifdef NX_DEBUG_INPUT
fprintf(stderr, "Session: Session resumed at '%s' timestamp [%lu].\n", GetTimeAsString(), GetTimeInMillis());
#else