From b56ab3670408f114729707cfcde5853516c91206 Mon Sep 17 00:00:00 2001
From: Robert Mader <robert.mader@collabora.com>
Date: Sun, 16 Apr 2023 11:21:49 +0200
Subject: [PATCH] xdg-shell: Always handle frame callbacks in
 popup_apply_state()

Just like we do in `toplevel_apply_state()`.

Closes https://gitlab.gnome.org/GNOME/mutter/-/issues/2752

Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/2963>
---
 src/wayland/meta-wayland-xdg-shell.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/wayland/meta-wayland-xdg-shell.c b/src/wayland/meta-wayland-xdg-shell.c
index 682024a2a..b48e79fd9 100644
--- a/src/wayland/meta-wayland-xdg-shell.c
+++ b/src/wayland/meta-wayland-xdg-shell.c
@@ -1240,7 +1240,10 @@ meta_wayland_xdg_popup_apply_state (MetaWaylandSurfaceRole  *surface_role,
     finish_popup_setup (xdg_popup);
 
   if (!meta_wayland_surface_get_window (surface))
-    return;
+    {
+      meta_wayland_actor_surface_queue_frame_callbacks (actor_surface, pending);
+      return;
+    }
 
   if (pending->xdg_positioner)
     {