Merge pull request #2153 from teejusb/verifythemename

Verify that PrefsTable[name] exists before attempting to index the preference in ThemPrefs
2021-10-01 00:23:12 +01:00
parent 84dd29527a 569b1dba33
commit 9ffaae7e15
1 changed files with 8 additions and 5 deletions
@@ -62,11 +62,14 @@ end
 local function ResolveTable( pref )
 	-- check the section for this theme
 	local name = GetThemeName()
-	local val = PrefsTable[name][pref]
-
-	if val ~= nil then
-		--Trace( ("ResolveTable(%s): found in %s"):format(pref,name) )
-		return PrefsTable[name]
+	local val = nil
+	
+	if PrefsTable[name] then
+		val = PrefsTable[name][pref]
+		if val ~= nil then
+			--Trace( ("ResolveTable(%s): found in %s"):format(pref,name) )
+			return PrefsTable[name]
+		end
 	end

 	-- not in the current theme; check the fallback if it exists