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

Fix a NRE in the exception handler.

Browse Source
This commit is contained in:
Paul Chote
2013-11-09 15:24:58 +13:00
parent 20f88387b6
commit 6aee253c94
2 changed files with 15 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
OpenRA.Game/Game.cs
View File

@@ -257,7 +257,14 @@ namespace OpenRA
public static Dictionary<String, Mod> CurrentMods public static Dictionary<String, Mod> CurrentMods
{ {
get { return Mod.AllMods.Where(k => modData.Manifest.Mods.Contains(k.Key)).ToDictionary(k => k.Key, k => k.Value); } get
{
// Initialization hasn't completed yet
if (Mod.AllMods == null || modData == null)
return null;
return Mod.AllMods.Where(k => modData.Manifest.Mods.Contains(k.Key)).ToDictionary(k => k.Key, k => k.Value);
}
} }
static Modifiers modifiers; static Modifiers modifiers;

9
OpenRA.Game/Support/Program.cs
View File

@@ -46,8 +46,13 @@ namespace OpenRA
static void FatalError(Exception e) static void FatalError(Exception e)
{ {
Log.AddChannel("exception", "exception.log"); Log.AddChannel("exception", "exception.log");
var mod = Game.CurrentMods.First().Value;
Log.Write("exception", "{0} Mod at Version {1}", mod.Title, mod.Version); if (Game.CurrentMods != null)
{
var mod = Game.CurrentMods.First().Value;
Log.Write("exception", "{0} Mod at Version {1}", mod.Title, mod.Version);
}
Log.Write("exception", "Operating System: {0} ({1})", Platform.CurrentPlatform, Environment.OSVersion); Log.Write("exception", "Operating System: {0} ({1})", Platform.CurrentPlatform, Environment.OSVersion);
Log.Write("exception", "Runtime Version: {0}", Platform.RuntimeVersion); Log.Write("exception", "Runtime Version: {0}", Platform.RuntimeVersion);
var rpt = BuildExceptionReport(e).ToString(); var rpt = BuildExceptionReport(e).ToString();