Merge remote-tracking branch 'origin/main' into fix/fix-game-process-hanging

# Conflicts:
#	defaults/assets/fgmod.sh

1 files changed, 13 insertions, 2 deletions

diff --git a/defaults/assets/fgmod.sh b/defaults/assets/fgmod.sh
index 2b8cd76..37f8946 100755
--- a/defaults/assets/fgmod.sh
+++ b/defaults/assets/fgmod.sh
@@ -68,7 +68,7 @@ for arg in "$@"; do
     fi
 
     # Extract executable path from YAML
-    exe_path=$(grep -E '^\s*exe:' "$config_file" | sed 's/.*exe:[[:space:]]*//')
+    exe_path=$(grep -E '^\s*exe:' "$config_file" | sed 's/.*exe:[[:space:]]*//' )
 
     if [[ -n "$exe_path" ]]; then
       exe_folder_path=$(dirname "$exe_path")
@@ -128,6 +128,11 @@ else
   logger -t fgmod "📄 OptiScaler.ini installed to $exe_folder_path"
 fi
 
+# === OptiScaler env variables Handling ===
+if [[ -f "$fgmod_path/update-optiscaler-config.py" ]]; then
+  python "$fgmod_path/update-optiscaler-config.py" "$exe_folder_path/OptiScaler.ini"
+fi
+
 # === ASI Plugins Directory ===
 if [[ -d "$fgmod_path/plugins" ]]; then
   echo "🔌 Installing ASI plugins directory"
@@ -187,8 +192,14 @@ if [[ $# -gt 1 ]]; then
   # Execute the original command
   export SteamDeck=0
   export WINEDLLOVERRIDES="$WINEDLLOVERRIDES,dxgi=n,b"
+
+  # Filter out leading -- separators (from Steam launch options)
+  while [[ $# -gt 0 && "$1" == "--" ]]; do
+    shift
+  done
+
   exec >/dev/null 2>&1
-  exec "$@"
+  "$@"
 else
   echo "Done!"
   echo "----------------------------------------"