Merge pull request #28 from Moondarker/testing

Testing
Moondarker · Mar 30, 2019 · 39c9b7c · 39c9b7c
2 parents dac8ebb + 5723731
commit 39c9b7c
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/ZomBerry/Addons/scripts/5_Mission/ZomBerry.c b/ZomBerry/Addons/scripts/5_Mission/ZomBerry.c
@@ -1,4 +1,4 @@
-static string g_zbryVer = "0.5.9s";
+static string g_zbryVer = "0.5.9s+";
 
 class ZomberryBase {
 	protected string remoteZbryVer = g_zbryVer;

diff --git a/ZomBerry/Addons/scripts/5_Mission/ZomBerryConfig.c b/ZomBerry/Addons/scripts/5_Mission/ZomBerryConfig.c
@@ -113,6 +113,10 @@ class ZomberryConfig {
 		ref ZBerryJsonConfig newConfigData;
 
 		JsonFileLoader<ZBerryJsonConfig>.JsonLoadFile(cfgPath + "ZomBerryConfig.json", newConfigData);
+		if (!newConfigData) {
+			ZomberryBase.Log( "ZomBerryConfig", "ERROR: Unable to find config file, will continue with default settings (MenuKey is M, debug disabled, separate config files)" );
+			return;
+		}
 
 		zbryDebug = newConfigData.DebugLevel;
 		defaultIOFlag = newConfigData.UseScriptLog;