From 4c22ab5714480f89ef1e8a55719d796ab51a55b0 Mon Sep 17 00:00:00 2001
From: "Ryan C. Gordon" <[EMAIL REDACTED]>
Date: Fri, 19 May 2023 10:18:45 -0400
Subject: [PATCH] syswm: simplified x11.fswindow and x11.wmwindow assignments.
Reference PR #292.
---
src/SDL12_compat.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/SDL12_compat.c b/src/SDL12_compat.c
index a17c503b5..a69eb74fe 100644
--- a/src/SDL12_compat.c
+++ b/src/SDL12_compat.c
@@ -7440,8 +7440,8 @@ SDL_GetWMInfo(SDL12_SysWMinfo *info12)
info12->info.x11.window = temp_window ? 0 : info20.info.x11.window;
if (SDL_VERSIONNUM(info12->version.major, info12->version.minor, info12->version.patch) >= SDL_VERSIONNUM(1, 0, 2)) {
/* While these don't exist in SDL2, some programs expect to get a valid window anyway. */
- info12->info.x11.fswindow = temp_window ? 0 : info20.info.x11.window;
- info12->info.x11.wmwindow = temp_window ? 0 : info20.info.x11.window;
+ info12->info.x11.fswindow = info20.info.x11.window;
+ info12->info.x11.wmwindow = info20.info.x11.window;
}
if (SDL_VERSIONNUM(info12->version.major, info12->version.minor, info12->version.patch) >= SDL_VERSIONNUM(1, 2, 12)) {
info12->info.x11.gfxdisplay = info20.info.x11.display; /* shrug */