summaryrefslogtreecommitdiffstats
path: root/xrdp/xrdp_wm.c
diff options
context:
space:
mode:
authorJay Sorg <jay.sorg@gmail.com>2012-05-07 11:00:32 -0700
committerJay Sorg <jay.sorg@gmail.com>2012-05-07 11:00:32 -0700
commit3e422c04c6289f3f1f7cf9ce4325982b942ede7c (patch)
tree90d6d4e81caaf366d217e7adaf049623ef7e14c7 /xrdp/xrdp_wm.c
parent9a03ab966d4d5e7883ff201dc6d455e5e7b7fb5f (diff)
downloadxrdp-proprietary-3e422c04c6289f3f1f7cf9ce4325982b942ede7c.tar.gz
xrdp-proprietary-3e422c04c6289f3f1f7cf9ce4325982b942ede7c.zip
fixes from ArvidNorr
Diffstat (limited to 'xrdp/xrdp_wm.c')
-rw-r--r--xrdp/xrdp_wm.c14
1 files changed, 10 insertions, 4 deletions
diff --git a/xrdp/xrdp_wm.c b/xrdp/xrdp_wm.c
index 8029d517..7d15c3d0 100644
--- a/xrdp/xrdp_wm.c
+++ b/xrdp/xrdp_wm.c
@@ -1475,10 +1475,16 @@ xrdp_wm_login_mode_changed(struct xrdp_wm* self)
}
else if (self->login_mode == 2)
{
- xrdp_wm_set_login_mode(self, 3); /* put the wm in connected mode */
- xrdp_wm_delete_all_childs(self);
- self->dragging = 0;
- xrdp_mm_connect(self->mm);
+ if (xrdp_mm_connect(self->mm) == 0)
+ {
+ xrdp_wm_set_login_mode(self, 3); /* put the wm in connected mode */
+ xrdp_wm_delete_all_childs(self);
+ self->dragging = 0;
+ }
+ else
+ {
+ /* we do nothing on connect error so far */
+ }
}
else if (self->login_mode == 10)
{