Merge branch 'devel' of https://github.com/neutrinolabs/xrdp into

devel

Conflicts:
	libxrdp/xrdp_sec.c

1 files changed, 8 insertions, 8 deletions

diff --git a/xrdp/xrdp_process.c b/xrdp/xrdp_process.c
index af56a4e1..5a7cd1d8 100644
--- a/xrdp/xrdp_process.c
+++ b/xrdp/xrdp_process.c
@@ -70,15 +70,15 @@ xrdp_process_loop(struct xrdp_process *self, struct stream *s)
     if (self->session != 0)
     {
         rv = libxrdp_process_data(self->session, s);
-    }
 
-    if ((self->wm == 0) && (self->session->up_and_running) && (rv == 0))
-    {
-        DEBUG(("calling xrdp_wm_init and creating wm"));
-        self->wm = xrdp_wm_create(self, self->session->client_info);
-        /* at this point the wm(window manager) is create and wm::login_mode is
-           zero and login_mode_event is set so xrdp_wm_init should be called by
-           xrdp_wm_check_wait_objs */
+        if ((self->wm == 0) && (self->session->up_and_running) && (rv == 0))
+        {
+            DEBUG(("calling xrdp_wm_init and creating wm"));
+            self->wm = xrdp_wm_create(self, self->session->client_info);
+            /* at this point the wm(window manager) is create and wm::login_mode is
+               zero and login_mode_event is set so xrdp_wm_init should be called by
+               xrdp_wm_check_wait_objs */
+        }
     }
 
     return rv;