aboutsummaryrefslogtreecommitdiff
path: root/nx-X11/programs/Xserver/hw/nxagent/Reconnect.c
diff options
context:
space:
mode:
authorUlrich Sibiller <uli42@gmx.de>2020-01-16 22:50:18 +0100
committerUlrich Sibiller <uli42@gmx.de>2020-04-07 13:53:01 +0200
commit46ec003667487d244828babe43884555fbe7322b (patch)
treed30985606bd6e255213e25ff5f60f140e64fbe40 /nx-X11/programs/Xserver/hw/nxagent/Reconnect.c
parent82fc54e577c56ee3952f14c4a5c9f50c16645591 (diff)
downloadnx-libs-46ec003667487d244828babe43884555fbe7322b.tar.gz
nx-libs-46ec003667487d244828babe43884555fbe7322b.tar.bz2
nx-libs-46ec003667487d244828babe43884555fbe7322b.zip
nxagent: re-implement timeout handling
Option -timeout used the screensaver facility. This patch changes that to an own timer that is independent. This effectly means we can drop most of the derived screensaving stuff in a follow-up commit.
Diffstat (limited to 'nx-X11/programs/Xserver/hw/nxagent/Reconnect.c')
-rw-r--r--nx-X11/programs/Xserver/hw/nxagent/Reconnect.c3
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