Set LuaConsole.MainForm on init

YoshiRulz · YoshiRulz · commit 2363d5e791ba · 2025-12-12T07:16:11.000+10:00
fixes f902c10
diff --git a/src/BizHawk.Client.EmuHawk/tools/Lua/LuaConsole.cs b/src/BizHawk.Client.EmuHawk/tools/Lua/LuaConsole.cs
@@ -50,8 +50,7 @@ public static Icon ToolIcon
 
 		public ToolDialogSettings.ColumnList Columns { get; set; }
 
-		[RequiredService]
-		private new IMainFormForApiInit MainForm { get; set; }
+		internal new IMainFormForApiInit MainForm { get; set; }
 
 		public class LuaConsoleSettings
 		{
diff --git a/src/BizHawk.Client.EmuHawk/tools/ToolManager.cs b/src/BizHawk.Client.EmuHawk/tools/ToolManager.cs
@@ -96,6 +96,7 @@ private void SetBaseProperties(IToolForm form)
 			f.Config = _config;
 			if (form is not ToolFormBase tool) return;
 			tool.SetToolFormBaseProps(_displayManager, _inputManager, _owner, _movieSession, this, _game);
+			if (form is LuaConsole luaConsole) luaConsole.MainForm = _owner; // could go via ServiceProvider but nah
 		}
 
 		/// <summary>

Original file line number	Diff line number	Diff line change
`@@ -50,8 +50,7 @@ public static Icon ToolIcon`
`50`	`50`
`51`	`51`	`public ToolDialogSettings.ColumnList Columns { get; set; }`
`52`	`52`
`53`		`- [RequiredService]`
`54`		`- private new IMainFormForApiInit MainForm { get; set; }`
	`53`	`+ internal new IMainFormForApiInit MainForm { get; set; }`
`55`	`54`
`56`	`55`	`public class LuaConsoleSettings`
`57`	`56`	`{`
Original file line number	Diff line number	Diff line change
`@@ -96,6 +96,7 @@ private void SetBaseProperties(IToolForm form)`
`96`	`96`	`f.Config = _config;`
`97`	`97`	`if (form is not ToolFormBase tool) return;`
`98`	`98`	`tool.SetToolFormBaseProps(_displayManager, _inputManager, _owner, _movieSession, this, _game);`
	`99`	`+ if (form is LuaConsole luaConsole) luaConsole.MainForm = _owner; // could go via ServiceProvider but nah`
`99`	`100`	`}`
`100`	`101`
`101`	`102`	`/// <summary>`