ShuriZma
/
BizHawk
mirror of https://github.com/TASEmulators/BizHawk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Prevent crashes on Set*ExtraPadding 

Prevent crashes when needing to invoke private methods from MainForm.
This commit is contained in:
upthorn 2020-05-13 08:57:12 -07:00
parent b37b82958a
commit d48651e668
1 changed files with 4 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/BizHawk.Client.EmuHawk/Api/ClientApi.cs
View File

@ -96,9 +96,9 @@ namespace BizHawk.Client.EmuHawk
{ {
typeList.Add(obj.GetType()); typeList.Add(obj.GetType());
} }
method = MainFormClass.GetMethod(name, typeList.ToArray()); method = MainFormClass.GetMethod(name, BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Static | BindingFlags.Instance, null, typeList.ToArray(), null);
} }
else method = MainFormClass.GetMethod(name); else method = MainFormClass.GetMethod(name, BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Instance);
if(method != null) if(method != null)
method.Invoke(ClientMainFormInstance, paramList); method.Invoke(ClientMainFormInstance, paramList);
@ -258,11 +258,7 @@ namespace BizHawk.Client.EmuHawk
/// <param name="bottom">Bottom padding</param> /// <param name="bottom">Bottom padding</param>
public static void SetGameExtraPadding(int left, int top, int right, int bottom) public static void SetGameExtraPadding(int left, int top, int right, int bottom)
{ {
FieldInfo f = ClientAssembly.GetType("BizHawk.Client.EmuHawk.GlobalWin").GetField("DisplayManager"); GlobalWin.DisplayManager.GameExtraPadding = new Padding(left, top, right, bottom);
object displayManager = f.GetValue(null);
f = f.FieldType.GetField("GameExtraPadding");
f.SetValue(displayManager, new Padding(left, top, right, bottom));
InvokeMainFormMethod("FrameBufferResized"); InvokeMainFormMethod("FrameBufferResized");
} }
@ -305,11 +301,7 @@ namespace BizHawk.Client.EmuHawk
/// <param name="bottom">Bottom padding</param> /// <param name="bottom">Bottom padding</param>
public static void SetExtraPadding(int left, int top, int right, int bottom) public static void SetExtraPadding(int left, int top, int right, int bottom)
{ {
FieldInfo f = ClientAssembly.GetType("BizHawk.Client.EmuHawk.GlobalWin").GetField("DisplayManager"); GlobalWin.DisplayManager.ClientExtraPadding = new Padding(left, top, right, bottom);
object displayManager = f.GetValue(null);
f = f.FieldType.GetField("ClientExtraPadding");
f.SetValue(displayManager, new Padding(left, top, right, bottom));
InvokeMainFormMethod("FrameBufferResized"); InvokeMainFormMethod("FrameBufferResized");
} }