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

Move GlobalWin.ExitCode to Program

This commit is contained in:
YoshiRulz 2020-11-26 21:41:54 +10:00
parent 6dfb0a8af8
commit 8aab0d00cd
No known key found for this signature in database
GPG Key ID: C4DE31C245353FB7
2 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/BizHawk.Client.EmuHawk/GlobalWin.cs
View File

@ -26,8 +26,6 @@ namespace BizHawk.Client.EmuHawk
public static readonly OSDManager OSD = new OSDManager();
public static DisplayManager DisplayManager;
public static int ExitCode;
public static Dictionary<string, object> UserBag { get; set; } = new Dictionary<string, object>();
public static Config Config { get; set; }

16
src/BizHawk.Client.EmuHawk/Program.cs
View File

@ -204,13 +204,14 @@ namespace BizHawk.Client.EmuHawk
SetDllDirectory(dllDir);
}
var exitCode = 0;
try
{
if (!OSTC.IsUnixHost && GlobalWin.Config.SingleInstanceMode)
{
try
{
InitAndRunSingleInstance(args);
InitAndRunSingleInstance(i => exitCode = i, args);
}
catch (ObjectDisposedException)
{
@ -225,7 +226,7 @@ namespace BizHawk.Client.EmuHawk
// mf.Text = title;
try
{
GlobalWin.ExitCode = mf.ProgramRunLoop();
exitCode = mf.ProgramRunLoop();
if (!mf.IsDisposed)
mf.Dispose();
}
@ -266,7 +267,7 @@ namespace BizHawk.Client.EmuHawk
//((IDisposable)GlobalWin.IGL_GL).Dispose();
//return 0 assuming things have gone well, non-zero values could be used as error codes or for scripting purposes
return GlobalWin.ExitCode;
return exitCode;
} //SubMain
//declared here instead of a more usual place to avoid dependencies on the more usual place
@ -323,10 +324,13 @@ namespace BizHawk.Client.EmuHawk
private class SingleInstanceController : WindowsFormsApplicationBase
{
private readonly Action<int> _setExitCode;
private readonly string[] cmdArgs;
public SingleInstanceController(string[] args)
public SingleInstanceController(Action<int> setExitCode, string[] args)
{
_setExitCode = setExitCode;
cmdArgs = args;
IsSingleInstance = true;
StartupNextInstance += this_StartupNextInstance;
@ -346,10 +350,10 @@ namespace BizHawk.Client.EmuHawk
var title = MainForm.Text;
MainForm.Show();
MainForm.Text = title;
GlobalWin.ExitCode = ((MainForm)MainForm).ProgramRunLoop();
_setExitCode(((MainForm) MainForm).ProgramRunLoop());
}
}
private static void InitAndRunSingleInstance(string[] args) => new SingleInstanceController(args).Run();
private static void InitAndRunSingleInstance(Action<int> setExitCode, string[] args) => new SingleInstanceController(setExitCode, args).Run();
}
}