AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'wip/fix-randr-race' into 'master'

Browse Source 
x11: Trap error when getting CRTC info

See merge request GNOME/gtk!4169
This commit is contained in:
Matthias Clasen 2021-11-20 14:43:48 +00:00
commit 9aaf54140f
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
gdk/x11/gdkscreen-x11.c
View File

@ -492,9 +492,18 @@ init_randr15 (GdkX11Screen *x11_screen)
if (output_info->crtc) if (output_info->crtc)
{ {
XRRCrtcInfo *crtc = XRRGetCrtcInfo (x11_screen->xdisplay, resources, output_info->crtc); XRRCrtcInfo *crtc;
int j; int j;
gdk_x11_display_error_trap_push (display);
crtc = XRRGetCrtcInfo (x11_screen->xdisplay, resources,
output_info->crtc);
if (gdk_x11_display_error_trap_pop (display))
{
XRRFreeOutputInfo (output_info);
continue;
}
for (j = 0; j < resources->nmode; j++) for (j = 0; j < resources->nmode; j++)
{ {
XRRModeInfo *xmode = &resources->modes[j]; XRRModeInfo *xmode = &resources->modes[j];