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

In Single Instance Mode - don't show an ObjectDisposedException

This commit is contained in:
adelikat 2013-08-25 22:43:34 +00:00
parent 07b1ad9bed
commit 85ce10c696
1 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
BizHawk.MultiClient/Program.cs
View File

@ -87,8 +87,14 @@ namespace BizHawk.MultiClient
#if WINDOWS
if (Global.Config.SingleInstanceMode)
{
SingleInstanceController controller = new SingleInstanceController(args);
controller.Run(args);
try
{
new SingleInstanceController(args).Run(args);
}
catch (ObjectDisposedException ex)
{
/*Eat it, MainForm disposed itself and Run attempts to dispose of itself. Eventually we would want to figure out a way to prevent that, but in the meantime it is harmless, so just eat the error*/
}
}
else
{
@ -193,30 +199,27 @@ namespace BizHawk.MultiClient
#if WINDOWS
public class SingleInstanceController : WindowsFormsApplicationBase
{
MainForm mf;
readonly string[] cmdArgs;
public SingleInstanceController(string[] args)
{
cmdArgs = args;
IsSingleInstance = true;
StartupNextInstance += this_StartupNextInstance;
}
void this_StartupNextInstance(object sender, StartupNextInstanceEventArgs e)
{
mf.LoadRom(e.CommandLine[0]);
(MainForm as MainForm).LoadRom(e.CommandLine[0]);
}
protected override void OnCreateMainForm()
{
MainForm = new RamWatch();
mf = new MainForm(cmdArgs);
MainForm = mf;
mf.Show();
mf.ProgramRunLoop();
}
MainForm = new MainForm(cmdArgs);
var title = MainForm.Text;
MainForm.Show();
MainForm.Text = title;
(MainForm as MainForm).ProgramRunLoop();
}
}
public static void DisplayDirect3DError()