From 293ed4fb089b50aa068362628b2506b33ea5e5d6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Kube=C5=A1a?= Date: Sun, 15 Nov 2026 15:35:14 +0100 Subject: [PATCH] fix(game-env): keep Sentry loaded for Godot games with its C# layer (#2605) Disabling libsentry.windows.* stops Sentry.Godot.dll's module initializer, so GodotPlugins never starts and the game hangs before the menu. Fixes #2604 --- tools/linuxfs/overlay/usr/local/bin/droiddeck-game-env | 3 ++- tools/tests/test_game_environment.py | 2 ++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/tools/linuxfs/overlay/usr/local/bin/droiddeck-game-env b/tools/linuxfs/overlay/usr/local/bin/droiddeck-game-env index c243a1afd2..89b4c1aeab 100755 --- a/tools/linuxfs/overlay/usr/local/bin/droiddeck-game-env +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-game-env @@ -124,7 +124,8 @@ def godot_vulkan(game): @fix def godot_sentry(game): sentry = sorted(n[:-4] for n in game.files if n.startswith("libsentry.windows.") and n.endswith(".dll")) - if is_godot(game) and sentry and ("coreclr.dll" in game.files or "godotsharp.dll" in game.files): + # Sentry.Godot.dll's module initializer P/Invokes the native DLL; without it GodotPlugins fails to start. + if is_godot(game) and sentry and ("coreclr.dll" in game.files or "godotsharp.dll" in game.files) and "sentry.godot.dll" not in game.files: return {"WINEDLLOVERRIDES": ";".join(n + "=d" for n in sentry)}, [], "Godot: Sentry crash handler off" diff --git a/tools/tests/test_game_environment.py b/tools/tests/test_game_environment.py index 30d859bc5a..81da67ec6e 100644 --- a/tools/tests/test_game_environment.py +++ b/tools/tests/test_game_environment.py @@ -1316,6 +1316,8 @@ class GameEnvironmentTest(unittest.TestCase): self.assertEqual(env["WINEDLLOVERRIDES"], "libsentry.windows.release.x86_64=d") self.assertEqual(extra, ["--rendering-driver", "vulkan"]) self.assertEqual(MODULE["engine_fixes"](str(game / "Game.exe"), ["--rendering-driver", "opengl3"])[1], []) + (game / "data_game_windows_x86_64/Sentry.Godot.dll").touch() + self.assertNotIn("WINEDLLOVERRIDES", MODULE["engine_fixes"](str(game / "Game.exe"), [])[0]) script = Path(tmp) / "GDScript Game" script.mkdir() for name in ("Game.exe", "Game.pck", "libsentry.windows.release.x86_64.dll"):