Marcus Meissner
37baaf773d
fixed wayland OBS-URL: https://build.opensuse.org/package/show/Emulators/wine?expand=0&rev=1117
34 lines
1.3 KiB
Diff
34 lines
1.3 KiB
Diff
From 1e701a6b3798ecfd688ad1ff405dbb62b3d214c6 Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?R=C3=A9mi=20Bernon?= <rbernon@codeweavers.com>
|
|
Date: Sat, 15 Jun 2024 18:36:50 +0200
|
|
Subject: [PATCH] winewayland: Avoid crashing when the dummy window surface is
|
|
used.
|
|
|
|
Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=56840
|
|
Signed-off-by: Marcus Meissner <marcus@jet.franken.de>
|
|
---
|
|
dlls/winewayland.drv/window_surface.c | 6 +++++-
|
|
1 file changed, 5 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/dlls/winewayland.drv/window_surface.c b/dlls/winewayland.drv/window_surface.c
|
|
index fb3b8750001..888fa74c085 100644
|
|
--- a/dlls/winewayland.drv/window_surface.c
|
|
+++ b/dlls/winewayland.drv/window_surface.c
|
|
@@ -489,8 +489,12 @@ failed:
|
|
void wayland_window_surface_update_wayland_surface(struct window_surface *window_surface,
|
|
struct wayland_surface *wayland_surface)
|
|
{
|
|
- struct wayland_window_surface *wws = wayland_window_surface_cast(window_surface);
|
|
+ struct wayland_window_surface *wws;
|
|
+
|
|
+ /* ignore calls with the dummy surface */
|
|
+ if (window_surface->funcs != &wayland_window_surface_funcs) return;
|
|
|
|
+ wws = wayland_window_surface_cast(window_surface);
|
|
window_surface_lock(window_surface);
|
|
|
|
TRACE("surface=%p hwnd=%p wayland_surface=%p\n", wws, window_surface->hwnd, wayland_surface);
|
|
--
|
|
2.45.2
|
|
|