isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-11-23 08:30:42 -05:00
Code Issues Packages Projects Releases Wiki Activity

wayland: Don't crash when trying to fullscreen on inert wl_output

Browse Source 
There is a race where an output can be used as a fullscreen target, but
it has already been removed due to a hotplug. Handle this gracefully by
ignoring said output in such situations.

https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/1120


(cherry picked from commit 512bb7d1cd)
This commit is contained in:
Jonas Ådahl 2020-03-11 12:27:07 +00:00
parent 7655a63af6
commit 57992f37cc
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/wayland/meta-wayland-legacy-xdg-shell.c
View File

@ -434,7 +434,7 @@ zxdg_toplevel_v6_set_fullscreen (struct wl_client *client,
if (output_resource) if (output_resource)
{ {
MetaWaylandOutput *output = wl_resource_get_user_data (output_resource); MetaWaylandOutput *output = wl_resource_get_user_data (output_resource);
if (output) if (output && output->logical_monitor)
meta_window_move_to_monitor (window, output->logical_monitor->number); meta_window_move_to_monitor (window, output->logical_monitor->number);
} }

2
src/wayland/meta-wayland-xdg-shell.c
View File

@ -431,7 +431,7 @@ xdg_toplevel_set_fullscreen (struct wl_client *client,
{ {
MetaWaylandOutput *output = wl_resource_get_user_data (output_resource); MetaWaylandOutput *output = wl_resource_get_user_data (output_resource);
if (output) if (output && output->logical_monitor)
{ {
meta_window_move_to_monitor (window, meta_window_move_to_monitor (window,
output->logical_monitor->number); output->logical_monitor->number);