Merge pull request #2247 from bmiklautz/fix/resizing_race
xfreerdp: fix a possible re-size race condition
This commit is contained in:
commit
c95cdfbdc7
@ -231,13 +231,6 @@ static void xf_desktop_resize(rdpContext* context)
|
||||
xfc->drawing = xfc->primary;
|
||||
}
|
||||
|
||||
if (!xfc->fullscreen)
|
||||
{
|
||||
if (xfc->window)
|
||||
xf_ResizeDesktopWindow(xfc, xfc->window, settings->DesktopWidth, settings->DesktopHeight);
|
||||
}
|
||||
else
|
||||
{
|
||||
#ifdef WITH_XRENDER
|
||||
if (!xfc->settings->SmartSizing)
|
||||
{
|
||||
@ -245,6 +238,14 @@ static void xf_desktop_resize(rdpContext* context)
|
||||
xfc->scaledHeight = xfc->height;
|
||||
}
|
||||
#endif
|
||||
|
||||
if (!xfc->fullscreen)
|
||||
{
|
||||
if (xfc->window)
|
||||
xf_ResizeDesktopWindow(xfc, xfc->window, settings->DesktopWidth, settings->DesktopHeight);
|
||||
}
|
||||
else
|
||||
{
|
||||
XSetFunction(xfc->display, xfc->gc, GXcopy);
|
||||
XSetFillStyle(xfc->display, xfc->gc, FillSolid);
|
||||
XSetForeground(xfc->display, xfc->gc, 0);
|
||||
|
Loading…
Reference in New Issue
Block a user