Merge pull request #845 from AntlerForce/fixmainmenu

Fix main menu not initializing if campaignConfigName is nil
beyond-all-reason · Dec 6, 2024 · 8e832eb · 8e832eb
2 parents 2d40461 + 5c7ac5b
commit 8e832eb
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 12 deletions.
diff --git a/LuaMenu/widgets/chobby/components/interface_root.lua b/LuaMenu/widgets/chobby/components/interface_root.lua
@@ -1226,15 +1226,8 @@ function GetInterfaceRoot(optionsParent, mainWindowParent, fontFunction)
 			heading_image.file = Configuration:GetHeadingImage(doublePanelMode, mainWindowHandler.GetSubheadingName())
 			heading_image:Invalidate()
 
-			local replacementTabs = Configuration.gameConfig.singleplayerConfig
-			--local replacementHelpTabs = Configuration.gameConfig.helpSubmenuConfig
-
 			WG.BattleRoomWindow.LeaveBattle(false, true)
 
-			mainWindowHandler.OpenSubmenu(1)
-
-			--mainWindowHandler.ReplaceSubmenu(SINGLEPLAYER_INDEX, replacementTabs)
-			--mainWindowHandler.ReplaceSubmenu(HELP_INDEX, replacementHelpTabs)
 		end
 	end
 	Configuration:AddListener("OnConfigurationChange", onConfigurationChange)
@@ -1266,6 +1259,8 @@ function GetInterfaceRoot(optionsParent, mainWindowParent, fontFunction)
 	-------------------------------------------------------------------
 	local screenWidth, screenHeight = Spring.GetViewSizes()
 
+	mainWindowHandler.OpenSubmenu(1)
+
 	battleStatusPanelHandler.Rescale(2, 70)
 	rightPanelHandler.Rescale(2, 70)
 	RescaleMainWindow(3, 70, 50)

diff --git a/LuaMenu/widgets/gui_login_window.lua b/LuaMenu/widgets/gui_login_window.lua
@@ -35,10 +35,6 @@ local function ResetRegisterRecieved()
 	registerRecieved = false
 end
 
-local function LoadMainMenu()
-	WG.Chobby.interfaceRoot.GetMainWindowHandler().OpenSubmenu(1)
-end
-
 local wantLoginStatus = {
 	["offline"] = true,
 	["closed"] = true,
@@ -109,7 +105,6 @@ local function CheckFirstTimeRegister()
 	end
 	local Configuration = WG.Chobby.Configuration
 	if Configuration.firstLoginEver then
-		LoadMainMenu()
 		LoginWindowHandler.TryLogin()
 	end
 end