diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2020-05-07 12:38:44 +0200 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2020-05-07 12:38:44 +0200 |
| commit | f2dc8121d903ddefba96483874dca69aac47fb59 (patch) | |
| tree | 995c21b3fe7334999b99efa9b52c1c0b7ebce8d6 /nx-X11/programs/Xserver/hw/nxagent/Reconnect.c | |
| parent | 82fc54e577c56ee3952f14c4a5c9f50c16645591 (diff) | |
| parent | fde52a9b773f85c59a3f6473f2fef08fde91016a (diff) | |
| download | nx-libs-f2dc8121d903ddefba96483874dca69aac47fb59.tar.gz nx-libs-f2dc8121d903ddefba96483874dca69aac47fb59.tar.bz2 nx-libs-f2dc8121d903ddefba96483874dca69aac47fb59.zip | |
Merge branch 'uli42-pr/refactor_timeout' into 3.6.x
Attributes GH PR #899: https://github.com/ArcticaProject/nx-libs/pull/899
Diffstat (limited to 'nx-X11/programs/Xserver/hw/nxagent/Reconnect.c')
| -rw-r--r-- | nx-X11/programs/Xserver/hw/nxagent/Reconnect.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Reconnect.c b/nx-X11/programs/Xserver/hw/nxagent/Reconnect.c index cfa0ec804..98db9ca92 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Reconnect.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Reconnect.c @@ -54,6 +54,7 @@ #include "Error.h" #include "Keystroke.h" #include "Utils.h" +#include "Init.h" #ifdef XKB #include "XKBsrv.h" @@ -361,6 +362,8 @@ void nxagentDisconnectSession(void) DECODE_SESSION_STATE(nxagentSessionState)); #endif + nxagentFreeTimeoutTimer(); + /* * Force an I/O error on the display * and wait until the NX transport |