summaryrefslogtreecommitdiffstats
path: root/xrdp/xrdp_wm.c
diff options
context:
space:
mode:
Diffstat (limited to 'xrdp/xrdp_wm.c')
-rw-r--r--xrdp/xrdp_wm.c17
1 files changed, 13 insertions, 4 deletions
diff --git a/xrdp/xrdp_wm.c b/xrdp/xrdp_wm.c
index 99aabe99..13156ebe 100644
--- a/xrdp/xrdp_wm.c
+++ b/xrdp/xrdp_wm.c
@@ -1864,7 +1864,7 @@ void add_string_to_logwindow(char *msg, struct list *log)
/*****************************************************************************/
int APP_CC
-xrdp_wm_log_msg(struct xrdp_wm *self, char *msg)
+xrdp_wm_show_log(struct xrdp_wm *self)
{
struct xrdp_bitmap *but;
int w;
@@ -1874,11 +1874,12 @@ xrdp_wm_log_msg(struct xrdp_wm *self, char *msg)
if (self->hide_log_window)
{
+ /* make sure autologin is off */
+ self->session->client_info->rdp_autologin = 0;
+ xrdp_wm_set_login_mode(self, 0); /* reset session */
return 0;
}
- add_string_to_logwindow(msg, self->log);
-
if (self->log_wnd == 0)
{
w = DEFAULT_WND_LOG_W;
@@ -1925,7 +1926,15 @@ xrdp_wm_log_msg(struct xrdp_wm *self, char *msg)
xrdp_wm_set_focused(self, self->log_wnd);
xrdp_bitmap_invalidate(self->log_wnd, 0);
- g_sleep(100);
+
+ return 0;
+}
+
+/*****************************************************************************/
+int APP_CC
+xrdp_wm_log_msg(struct xrdp_wm *self, char *msg)
+{
+ add_string_to_logwindow(msg, self->log);
return 0;
}