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

Merge pull request #2247 from bmiklautz/fix/resizing_race

Browse Source 
xfreerdp: fix a possible re-size race condition
This commit is contained in:
Norbert Federa 2014-12-03 18:21:53 +01:00
commit c95cdfbdc7
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
client/X11/xf_client.c
View File

@ -231,13 +231,6 @@ static void xf_desktop_resize(rdpContext* context)
xfc->drawing = xfc->primary; xfc->drawing = xfc->primary;
} }
if (!xfc->fullscreen)
{
if (xfc->window)
xf_ResizeDesktopWindow(xfc, xfc->window, settings->DesktopWidth, settings->DesktopHeight);
}
else
{
#ifdef WITH_XRENDER #ifdef WITH_XRENDER
if (!xfc->settings->SmartSizing) if (!xfc->settings->SmartSizing)
{ {
@ -245,6 +238,14 @@ static void xf_desktop_resize(rdpContext* context)
xfc->scaledHeight = xfc->height; xfc->scaledHeight = xfc->height;
} }
#endif #endif
if (!xfc->fullscreen)
{
if (xfc->window)
xf_ResizeDesktopWindow(xfc, xfc->window, settings->DesktopWidth, settings->DesktopHeight);
}
else
{
XSetFunction(xfc->display, xfc->gc, GXcopy); XSetFunction(xfc->display, xfc->gc, GXcopy);
XSetFillStyle(xfc->display, xfc->gc, FillSolid); XSetFillStyle(xfc->display, xfc->gc, FillSolid);
XSetForeground(xfc->display, xfc->gc, 0); XSetForeground(xfc->display, xfc->gc, 0);