|
 |
776610 |
From 1514880e92841d51a557edd505555de3e4a5b6ae Mon Sep 17 00:00:00 2001
|
|
|
776610 |
From: =?UTF-8?q?Jonas=20=C3=85dahl?= <jadahl@gmail.com>
|
|
|
776610 |
Date: Mon, 27 Aug 2018 17:49:52 +0200
|
|
|
776610 |
Subject: [PATCH] window/wayland: Don't recursive indefinitely when updating
|
|
|
776610 |
monitor
|
|
|
776610 |
|
|
|
776610 |
When we update the main monitor, there is a rule that makes it so that
|
|
|
776610 |
popup windows use the same main monitor as their parent. In the commit
|
|
|
776610 |
f4d07caa38e51d09ee73bab20334a6b5c28952d6 the call that updates and
|
|
|
776610 |
fetches the main monitor of the toplevel accidentally changed to update
|
|
|
776610 |
from itself, causing a indefinite recursion eventually resulting in a
|
|
|
776610 |
crash.
|
|
|
776610 |
|
|
|
776610 |
Closes: https://gitlab.gnome.org/GNOME/mutter/issues/279
|
|
|
776610 |
(cherry picked from commit e191c21e04cfaa560f8dd51f4f91013af98ccf4e)
|
|
|
776610 |
---
|
|
|
776610 |
src/wayland/meta-window-wayland.c | 2 +-
|
|
|
776610 |
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
776610 |
|
|
|
776610 |
diff --git a/src/wayland/meta-window-wayland.c b/src/wayland/meta-window-wayland.c
|
|
|
776610 |
index e837215de..241e6b61c 100644
|
|
|
776610 |
--- a/src/wayland/meta-window-wayland.c
|
|
|
776610 |
+++ b/src/wayland/meta-window-wayland.c
|
|
|
776610 |
@@ -392,7 +392,7 @@ meta_window_wayland_update_main_monitor (MetaWindow *window,
|
|
|
776610 |
toplevel_window = meta_wayland_surface_get_toplevel_window (window->surface);
|
|
|
776610 |
if (toplevel_window != window)
|
|
|
776610 |
{
|
|
|
776610 |
- meta_window_update_monitor (window, flags);
|
|
|
776610 |
+ meta_window_update_monitor (toplevel_window, flags);
|
|
|
776610 |
window->monitor = toplevel_window->monitor;
|
|
|
776610 |
return;
|
|
|
776610 |
}
|
|
|
776610 |
--
|
|
|
776610 |
2.19.0
|
|
|
776610 |
|