Commit 56d273ee authored by Olivier Fourdan's avatar Olivier Fourdan 🛠 Committed by Olivier Fourdan

compositor: Ignore XError when changing background picture

If xfwm4 is compiled with support for the root pixmap in the compositor,
changing the background image may cause an XError if the external pixmap
is already freed.

Guard against such XError.
Signed-off-by: Olivier Fourdan's avatarOlivier Fourdan <fourdan@xfce.org>
Closes: #476
parent 59c38d24
Pipeline #5177 passed with stages
in 2 minutes and 52 seconds
......@@ -3774,8 +3774,11 @@ compositorHandlePropertyNotify (DisplayInfo *display_info, XPropertyEvent *ev)
ScreenInfo *screen_info = myDisplayGetScreenFromRoot (display_info, ev->window);
if ((screen_info) && (screen_info->compositor_active) && (screen_info->rootTile))
{
myDisplayErrorTrapPush (display_info);
XClearArea (display_info->dpy, screen_info->output, 0, 0, 0, 0, TRUE);
XRenderFreePicture (display_info->dpy, screen_info->rootTile);
myDisplayErrorTrapPopIgnored (display_info);
screen_info->rootTile = None;
damage_screen (screen_info);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment