From edfff3b0bf935c1d803d731b2227805169c549a9 Mon Sep 17 00:00:00 2001
From: R1kaB3rN <100738684+R1kaB3rN@users.noreply.github.com>
Date: Tue, 22 Oct 2024 15:35:03 -0700
Subject: [PATCH 1/2] umu_run: handle ValueError when rearranging base layer

---
 umu/umu_run.py | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/umu/umu_run.py b/umu/umu_run.py
index ebd9fd7f6..7e9e02cc4 100755
--- a/umu/umu_run.py
+++ b/umu/umu_run.py
@@ -467,7 +467,14 @@ def rearrange_gamescope_baselayer_order(
     if not steam_layer_id:
         return None
 
-    rearranged.remove(steam_layer_id)
+    try:
+        rearranged.remove(steam_layer_id)
+    except ValueError as e:
+        # Case when the layer ID isn't in GAMESCOPECTRL_BASELAYER_APPID
+        # One case this can occur is if the client overrides Steam's env vars
+        # that we get the layer ID from
+        log.exception(e)
+        return None
 
     # Steam's window should last, while assigned layer 2nd to last
     rearranged = [*rearranged[:-1], steam_layer_id, STEAM_WINDOW_ID]

From c807ce7bc60e3293a98ecbc95fad8fedaa860550 Mon Sep 17 00:00:00 2001
From: R1kaB3rN <100738684+R1kaB3rN@users.noreply.github.com>
Date: Tue, 22 Oct 2024 15:41:44 -0700
Subject: [PATCH 2/2] umu_run: fix comment

---
 umu/umu_run.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/umu/umu_run.py b/umu/umu_run.py
index 7e9e02cc4..df558c661 100755
--- a/umu/umu_run.py
+++ b/umu/umu_run.py
@@ -476,7 +476,7 @@ def rearrange_gamescope_baselayer_order(
         log.exception(e)
         return None
 
-    # Steam's window should last, while assigned layer 2nd to last
+    # Steam's window should be last, while assigned layer 2nd to last
     rearranged = [*rearranged[:-1], steam_layer_id, STEAM_WINDOW_ID]
     log.debug("Rearranging base layer sequence")
     log.debug("'%s' -> '%s'", sequence, rearranged)