epic/OpenRA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix log should be disposed correctly

Browse Source
This commit is contained in:
teinarss
2021-04-14 19:10:49 +02:00
committed by Paul Chote
parent b23d533006
commit 5667081764
2 changed files with 18 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
OpenRA.Launcher/Program.cs
View File

@@ -20,19 +20,22 @@ namespace OpenRA.Launcher
[STAThread] [STAThread]
static int Main(string[] args) static int Main(string[] args)
{ {
if (Debugger.IsAttached || args.Contains("--just-die"))
return (int)Game.InitializeAndRun(args);
AppDomain.CurrentDomain.UnhandledException += (_, e) => ExceptionHandler.HandleFatalError((Exception)e.ExceptionObject);
try try
{ {
return (int)Game.InitializeAndRun(args); if (Debugger.IsAttached || args.Contains("--just-die"))
} return (int)Game.InitializeAndRun(args);
catch (Exception e)
{ AppDomain.CurrentDomain.UnhandledException += (_, e) => ExceptionHandler.HandleFatalError((Exception)e.ExceptionObject);
ExceptionHandler.HandleFatalError(e);
return (int)RunStatus.Error; try
{
return (int)Game.InitializeAndRun(args);
}
catch (Exception e)
{
ExceptionHandler.HandleFatalError(e);
return (int)RunStatus.Error;
}
} }
finally finally
{ {

4
OpenRA.WindowsLauncher/Program.cs
View File

@@ -78,6 +78,10 @@ namespace OpenRA.WindowsLauncher
ExceptionHandler.HandleFatalError(e); ExceptionHandler.HandleFatalError(e);
return (int)RunStatus.Error; return (int)RunStatus.Error;
} }
finally
{
Log.Dispose();
}
} }
static int RunInnerLauncher(string[] args) static int RunInnerLauncher(string[] args)