[mutter/wip/rstrode/rhel-8.0.0: 13/117] window/wayland: Don't recursive indefinitely when updating monitor

[Ray Strode <halfline src gnome org>]

commit 60b62af343d77d47329e919f04d296dc42dc8ca5
Author: Jonas Ådahl <jadahl gmail com>
Date:   Mon Aug 27 17:49:52 2018 +0200

    window/wayland: Don't recursive indefinitely when updating monitor
    
    When we update the main monitor, there is a rule that makes it so that
    popup windows use the same main monitor as their parent. In the commit
    f4d07caa38e51d09ee73bab20334a6b5c28952d6 the call that updates and
    fetches the main monitor of the toplevel accidentally changed to update
    from itself, causing a indefinite recursion eventually resulting in a
    crash.
    
    Closes: https://gitlab.gnome.org/GNOME/mutter/issues/279
    (cherry picked from commit e191c21e04cfaa560f8dd51f4f91013af98ccf4e)

 src/wayland/meta-window-wayland.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
---
diff --git a/src/wayland/meta-window-wayland.c b/src/wayland/meta-window-wayland.c
index 544c60b5b..54a6da17e 100644
--- a/src/wayland/meta-window-wayland.c
+++ b/src/wayland/meta-window-wayland.c
@@ -392,7 +392,7 @@ meta_window_wayland_update_main_monitor (MetaWindow                   *window,
   toplevel_window = meta_wayland_surface_get_toplevel_window (window->surface);
   if (toplevel_window != window)
     {
-      meta_window_update_monitor (window, flags);
+      meta_window_update_monitor (toplevel_window, flags);
       window->monitor = toplevel_window->monitor;
       return;
     }