isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2025-01-27 03:49:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

window/wayland: Always update monitor for non-user ops

Browse Source 
meta_window_wayland_update_main_monitor() would skip the monitor update
if the difference in scale between the old and the new monitor would
cause another monitor change.

While this is suitable when the monitor change results from a user
interactively moving the surface between monitors of different scales,
this can leave dangling pointers to freed monitors when this is
triggered by a change of monitor configuration.

Make sure we update the monitor unconditionally if not from a user
operation.

Closes: https://gitlab.gnome.org/GNOME/mutter/issues/189


(cherry picked from commit a3da4b8d5bd217c0262fd9361036877d155a300f)
This commit is contained in:
Olivier Fourdan 2018-06-18 10:39:11 +00:00 committed by Marco Trevisan
parent 0c5e61a2ab
commit d74a046060
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/wayland/meta-window-wayland.c
View File

@ -413,6 +413,12 @@ meta_window_wayland_update_main_monitor (MetaWindow *window,
return;
}
if (!user_op)
{
window->monitor = to;
return;
}
from_scale = meta_logical_monitor_get_scale (from);
to_scale = meta_logical_monitor_get_scale (to);