mirrors/xrdp
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #554 from proski/xorg24bpp

Browse Source 
Regression fix: session matching uses wrong bpp for Xorg
This commit is contained in:
Idan Freiberg 2016-12-18 02:48:16 -05:00 committed by GitHub
commit 6376249953
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
xrdp/xrdp_mm.c
View File

@ -229,14 +229,19 @@ xrdp_mm_send_login(struct xrdp_mm *self)
out_uint16_be(s, self->wm->screen->width); out_uint16_be(s, self->wm->screen->width);
out_uint16_be(s, self->wm->screen->height); out_uint16_be(s, self->wm->screen->height);
if (xserverbpp > 0) /* select and send X server bpp */
if (xserverbpp == 0)
{ {
out_uint16_be(s, xserverbpp); if (self->code == 20)
} {
else xserverbpp = 24; /* xorgxrdp is always at 24 bpp */
{ }
out_uint16_be(s, self->wm->screen->bpp); else
{
xserverbpp = self->wm->screen->bpp; /* use client's bpp */
}
} }
out_uint16_be(s, xserverbpp);
/* send domain */ /* send domain */
if(self->wm->client_info->domain[0]!='_') if(self->wm->client_info->domain[0]!='_')