summaryrefslogtreecommitdiffstats
path: root/xrdp/xrdp_process.c
diff options
context:
space:
mode:
authorJay Sorg <jay.sorg@gmail.com>2012-06-21 21:36:03 -0700
committerJay Sorg <jay.sorg@gmail.com>2012-06-21 21:36:03 -0700
commit608101fbcad50b9d201577c02f2779947807738e (patch)
tree488e2e1bccc39982b5c8d550261d52a13f1596a1 /xrdp/xrdp_process.c
parent963ceaacabd97ba8a9b9e32da27d20cab6285d2d (diff)
parent02124492c26db64b6a3256c0b14f5533bd37aec7 (diff)
downloadxrdp-proprietary-608101fbcad50b9d201577c02f2779947807738e.tar.gz
xrdp-proprietary-608101fbcad50b9d201577c02f2779947807738e.zip
Merge branch 'master' of github.com:FreeRDP/xrdp
Diffstat (limited to 'xrdp/xrdp_process.c')
-rw-r--r--xrdp/xrdp_process.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/xrdp/xrdp_process.c b/xrdp/xrdp_process.c
index df69d057..7a88d524 100644
--- a/xrdp/xrdp_process.c
+++ b/xrdp/xrdp_process.c
@@ -161,7 +161,7 @@ xrdp_process_main_loop(struct xrdp_process* self)
robjs[robjs_count++] = self->self_term_event;
xrdp_wm_get_wait_objs(self->wm, robjs, &robjs_count,
wobjs, &wobjs_count, &timeout);
- trans_get_wait_objs(self->server_trans, robjs, &robjs_count, &timeout);
+ trans_get_wait_objs(self->server_trans, robjs, &robjs_count);
/* wait */
if (g_obj_wait(robjs, robjs_count, wobjs, wobjs_count, timeout) != 0)
{