diff options
| author | Gormogon <Gormogon@users.noreply.github.com> | 2016-05-29 16:53:04 -0400 |
|---|---|---|
| committer | Gormogon <Gormogon@users.noreply.github.com> | 2016-05-29 16:53:04 -0400 |
| commit | 85142935b63324f7c6131a8855acea0a2d534879 (patch) | |
| tree | 43636f299d48ed1e9d06e4a0bc626c615ca05629 /StardewModdingAPI | |
| parent | 625f9c89e4db470c0325b5d148c5286c1b5e54eb (diff) | |
| download | SMAPI-85142935b63324f7c6131a8855acea0a2d534879.tar.gz SMAPI-85142935b63324f7c6131a8855acea0a2d534879.tar.bz2 SMAPI-85142935b63324f7c6131a8855acea0a2d534879.zip | |
Account for possible NPE
Diffstat (limited to 'StardewModdingAPI')
| -rw-r--r-- | StardewModdingAPI/Program.cs | 15 |
1 files changed, 9 insertions, 6 deletions
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
{
|