Merge pull request #128 from Lemonymous/fixes-misc

Fixes misc
itb-community · Apr 11, 2022 · f290628 · f290628
2 parents a91eecb + c56fad2
commit f290628
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 6 deletions.
diff --git a/scripts/mod_loader/modapi/misc.lua b/scripts/mod_loader/modapi/misc.lua
@@ -77,7 +77,7 @@ function modApi:getModOptions(modId)
 
 	if modId == nil then
 		Assert.ModInitializingOrLoading("Argument #1 must be specified outside of init or load")
-		modId = mod_loader.currentMod
+		modId = self.currentMod
 	end
 
 	Assert.True(mod_loader:hasMod(modId), "Mod not found")

diff --git a/scripts/mod_loader/modui/mod_configuration.lua b/scripts/mod_loader/modui/mod_configuration.lua
@@ -432,10 +432,6 @@ end
 
 local function buildModConfigContent(scroll)
 
-	if currentSelectedOptions == nil then
-		currentSelectedOptions = buildLightModOptions()
-	end
-
 	openDropdowns = {}
 
 	scrollContent = UiBoxLayout()
@@ -572,3 +568,14 @@ function ConfigureMods()
 
 	showModConfig()
 end
+
+local function updateCurrentModConfiguration()
+	currentSelectedOptions = buildLightModOptions()
+end
+
+function modApi:getCurrentModConfiguration()
+	return currentSelectedOptions
+end
+
+modApi.events.onModsInitialized:subscribe(updateCurrentModConfiguration)
+modApi.events.onProfileChanged:subscribe(updateCurrentModConfiguration)
diff --git a/scripts/mod_loader/ui/widgets/base.lua b/scripts/mod_loader/ui/widgets/base.lua
@@ -139,7 +139,7 @@ end
 	element successfully obtained focus.
 --]]
 function Ui:setfocus()
-	if not self.visible then return false end
+	if not self.visible or self.root == nil then return false end
 
 	self.root:setfocus(self)
 end