From 6e5aba78c03e7e473dec243df5270bfc164613b6 Mon Sep 17 00:00:00 2001
From: Eamonn Rea <eamonnrea@gmail.com>
Date: Wed, 2 Oct 2024 20:35:18 +0100
Subject: [PATCH] lang: Don't create global config in `loadLanguage` (#1178)

---
 steamtinkerlaunch | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/steamtinkerlaunch b/steamtinkerlaunch
index da11d248..c8305851 100755
--- a/steamtinkerlaunch
+++ b/steamtinkerlaunch
@@ -7,7 +7,7 @@
 PREFIX="/usr"
 PROGNAME="SteamTinkerLaunch"
 NICEPROGNAME="Steam Tinker Launch"
-PROGVERS="v14.0.20241003-1"
+PROGVERS="v14.0.20241003-2"
 PROGCMD="${0##*/}"
 PROGINTERNALPROTNAME="Proton-stl"
 SHOSTL="stl"
@@ -2696,8 +2696,13 @@ function loadLanguage {
 	writelog "INFO" "${FUNCNAME[0]} - First load the default language '$STLDEFLANG' to make sure all variables are filled"
 	loadLangFile "$STLDEFLANG"
 
-	saveCfg "$STLDEFGLOBALCFG" X
-	loadCfg "$STLDEFGLOBALCFG" X
+	# Prevents loadLanguage from creating the global.conf too early when it may be missing values
+	# i.e. loadLanguage may be called before setSteamPaths, which can result in creating paths without the required Steam path variables set yet
+	#      This can happen with Luxtorpead, where the LUXTORPEDACMD may be written out before `setSteamPaths` has been called to set `STEAMCOMPATTOOL`
+	if [ -f "$STLDEFGLOBALCFG" ]; then
+		saveCfg "$STLDEFGLOBALCFG" X
+		loadCfg "$STLDEFGLOBALCFG" X
+	fi
 
 	writelog "INFO" "${FUNCNAME[0]} - Loading STLLANG from '$STLDEFGLOBALCFG'"