[gtk/cherry-pick-d89e82d4] Merge branch 'wip/otte/for-master' into 'master'

[Benjamin Otte <otte src gnome org>]

commit 3c90385716498ca9a70de9260d2853e445050575
Author: Benjamin Otte <otte benjamin googlemail com>
Date:   Mon Oct 11 18:36:20 2021 +0000

    Merge branch 'wip/otte/for-master' into 'master'
    
    x11: Don't try to move destroyed windows
    
    See merge request GNOME/gtk!4054
    
    (cherry picked from commit d89e82d4a082febfe44d3504786fcab91eab62a3)
    
    f40ce51a x11: Don't try to move destroyed windows

 gdk/x11/gdksurface-x11.c | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)
---
diff --git a/gdk/x11/gdksurface-x11.c b/gdk/x11/gdksurface-x11.c
index dd1d0d3bd2..bdedcfc0f2 100644
--- a/gdk/x11/gdksurface-x11.c
+++ b/gdk/x11/gdksurface-x11.c
@@ -1923,8 +1923,13 @@ gdk_x11_surface_update_popups (GdkSurface *parent)
     {
       GdkX11Surface *popup_impl = l->data;
       GdkSurface *popup = GDK_SURFACE (popup_impl);
-      int new_x = GDK_X11_SURFACE (parent)->abs_x + popup->x;
-      int new_y = GDK_X11_SURFACE (parent)->abs_y + popup->y;
+      int new_x, new_y;
+
+      if (GDK_SURFACE_DESTROYED (popup))
+        continue;
+
+      new_x = GDK_X11_SURFACE (parent)->abs_x + popup->x;
+      new_y = GDK_X11_SURFACE (parent)->abs_y + popup->y;
 
       if (new_x != popup_impl->abs_x || new_y != popup_impl->abs_y)
         x11_surface_move (popup, new_x, new_y);