From 5d805b69861023650664607fa8a6fbe21f2db09a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Bernon?= <rbernon@codeweavers.com>
Date: Tue, 23 Jan 2024 09:43:02 +0100
Subject: [PATCH] proton: Enable the new SDL 2.30 Steam Input integration.

CW-Bug-Id: #23185
---
 proton | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/proton b/proton
index 66340546..2faa16b6 100755
--- a/proton
+++ b/proton
@@ -1317,6 +1317,10 @@ class Session:
         else:
             self.env.pop("LC_ALL", "")
 
+        # CW-Bug-Id: #23185 Enable the new SDL 2.30 Steam Input integration.
+        if "SteamVirtualGamepadInfo_Proton" in self.env and "SteamVirtualGamepadInfo" not in self.env:
+            self.env["SteamVirtualGamepadInfo"] = self.env["SteamVirtualGamepadInfo_Proton"]
+
         self.env.pop("WINEARCH", "")
 
         if 'ORIG_'+ld_path_var not in os.environ:
@@ -1746,9 +1750,6 @@ if __name__ == "__main__":
         log("No compat data path?")
         sys.exit(1)
 
-    # CW-Bug-Id: #23185 Avoid triggering new SDL 2.30 behavior.
-    os.environ.pop('SteamVirtualGamepadInfo', None)
-
     g_proton = Proton(os.path.dirname(sys.argv[0]))
 
     g_proton.cleanup_legacy_dist()