isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2025-02-18 06:04:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

monitor-manager/x11: Ignore errors when creating tiled monitors

Browse Source 
The error is most likely a race where the tiled outputs disappeared
before we had the chance to turn them into a whole monitor. Ignoring the
error should be harmless, as we should be receive another RANDR event
where we'd eventually fix things up.

Closes: https://gitlab.gnome.org/GNOME/gnome-shell/-/issues/7120
Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/3335>
This commit is contained in:
Jonas Ådahl 2023-10-21 00:45:49 +08:00 committed by Marge Bot
parent 5780c10002
commit 8d3696f39a
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/backends/x11/meta-monitor-manager-xrandr.c
View File

@ -770,9 +770,11 @@ meta_monitor_manager_xrandr_tiled_monitor_added (MetaMonitorManager *manager,
xrandr_monitor_info->outputs[i] = meta_output_get_id (output); xrandr_monitor_info->outputs[i] = meta_output_get_id (output);
} }
mtk_x11_error_trap_push (manager_xrandr->xdisplay);
XRRSetMonitor (manager_xrandr->xdisplay, XRRSetMonitor (manager_xrandr->xdisplay,
DefaultRootWindow (manager_xrandr->xdisplay), DefaultRootWindow (manager_xrandr->xdisplay),
xrandr_monitor_info); xrandr_monitor_info);
mtk_x11_error_trap_pop (manager_xrandr->xdisplay);
XRRFreeMonitors (xrandr_monitor_info); XRRFreeMonitors (xrandr_monitor_info);
} }