From 23dde0860c4c11be5c1168042dff0f72eedacdda Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michel=20D=C3=A4nzer?= <mdaenzer@redhat.com>
Date: Mon, 5 Aug 2024 18:48:35 +0200
Subject: [PATCH] xwayland/present: Update surface window again if manual
 redirect fails

Even if the manual redirect didn't result in the surface window we
wanted, it might be different again without the redirect.

I don't know of any specific scenario hitting this though, it's more of
a theoretical safeguard.

Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1637>
---
 hw/xwayland/xwayland-present.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/hw/xwayland/xwayland-present.c b/hw/xwayland/xwayland-present.c
index f2b4154f7..5a7d7a156 100644
--- a/hw/xwayland/xwayland-present.c
+++ b/hw/xwayland/xwayland-present.c
@@ -1308,6 +1308,7 @@ xwl_present_maybe_redirect_window(WindowPtr window)
         compUnredirectWindow(serverClient, window, CompositeRedirectManual);
         xwl_present_window->redirected = FALSE;
         xwl_present_window->redirect_failed = TRUE;
+        xwl_window_update_surface_window(xwl_window);
         return FALSE;
     }