summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormetalefty <meta@vmeta.jp>2017-01-18 08:59:15 +0900
committerGitHub <noreply@github.com>2017-01-18 08:59:15 +0900
commit0afbd57638cbba35d6c081e91262b7c267d04c17 (patch)
treef3eb55a32124ab0cd4a8018f850245575455f72d
parent19375dda7a12e955f053f32ea6a1d206a773010d (diff)
parent97cd454cd605aaf39c17b0a289fc20520da52f5b (diff)
downloadxrdp-proprietary-0afbd57638cbba35d6c081e91262b7c267d04c17.tar.gz
xrdp-proprietary-0afbd57638cbba35d6c081e91262b7c267d04c17.zip
Merge pull request #628 from metalefty/kill_disconnected
x11rdp: respect disconnect timeout set by XRDP_SESMAN_MAX_DISC_TIME
-rw-r--r--xorg/X11R7.6/rdp/rdpup.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/xorg/X11R7.6/rdp/rdpup.c b/xorg/X11R7.6/rdp/rdpup.c
index 54eb779d..42435f8b 100644
--- a/xorg/X11R7.6/rdp/rdpup.c
+++ b/xorg/X11R7.6/rdp/rdpup.c
@@ -1337,7 +1337,6 @@ rdpup_init(void)
if (i != 0)
{
g_do_kill_disconnected = 1;
- g_disconnect_timeout_s = 0;
}
}