From 85142935b63324f7c6131a8855acea0a2d534879 Mon Sep 17 00:00:00 2001 From: Gormogon Date: Sun, 29 May 2016 16:53:04 -0400 Subject: Account for possible NPE --- StardewModdingAPI/Program.cs | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) (limited to 'StardewModdingAPI/Program.cs') diff --git a/StardewModdingAPI/Program.cs b/StardewModdingAPI/Program.cs index 35963b08..81e48c7d 100644 --- a/StardewModdingAPI/Program.cs +++ b/StardewModdingAPI/Program.cs @@ -225,7 +225,7 @@ namespace StardewModdingAPI LoadMods(); StardewForm = Control.FromHandle(gamePtr.Window.Handle).FindForm(); - StardewForm.Closing += StardewForm_Closing; + if (StardewForm != null) StardewForm.Closing += StardewForm_Closing; ready = true; @@ -328,11 +328,14 @@ namespace StardewModdingAPI Log.AsyncY("Loading Mod DLL..."); var tar = mod.DefinedTypes.First(x => x.BaseType == typeof(Mod)); var m = (Mod) mod.CreateInstance(tar.ToString()); - m.PathOnDisk = targDir; - m.Manifest = manifest; - Log.AsyncG($"LOADED MOD: {m.Manifest.Name} by {m.Manifest.Authour} - Version {m.Manifest.Version} | Description: {m.Manifest.Description} (@ {targDll})"); - Constants.ModsLoaded += 1; - m.Entry(); + if (m != null) + { + m.PathOnDisk = targDir; + m.Manifest = manifest; + Log.AsyncG($"LOADED MOD: {m.Manifest.Name} by {m.Manifest.Authour} - Version {m.Manifest.Version} | Description: {m.Manifest.Description} (@ {targDll})"); + Constants.ModsLoaded += 1; + m.Entry(); + } } else { -- cgit