pepperdash/Essentials
1
0
Fork 0
mirror of https://github.com/PepperDash/Essentials.git synced 2026-04-13 20:47:04 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'origin/bugfix/load-plugins-crash-with-no-plugins' into feature/ecs-1209

Browse source
This commit is contained in:
Neil Dorin 2020-03-30 10:45:49 -06:00
commit 0e5052910f
2 changed files with 10 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

4
PepperDashEssentials/AppServer/MobileControlSystemController.cs
View file

@ -290,6 +290,10 @@ namespace PepperDash.Essentials
SystemUuid); SystemUuid);
} }
} }
else
{
Debug.Console(0, "Authorization failed, code {0}: {1}", r.Code, r.ContentString);
}
} }
else else
Debug.Console(0, this, "Error {0} in authorizing system", e); Debug.Console(0, this, "Error {0} in authorizing system", e);

11
PepperDashEssentials/PluginLoading/PluginLoading.cs
View file

@ -415,14 +415,15 @@ namespace PepperDash.Essentials
// Deal with any .cplz files // Deal with any .cplz files
UnzipAndMoveCplzArchives(); UnzipAndMoveCplzArchives();
// Load the assemblies from the loadedPlugins folder into the AppDomain if(Directory.Exists(_loadedPluginsDirectoryPath) {
LoadPluginAssemblies(); // Load the assemblies from the loadedPlugins folder into the AppDomain
LoadPluginAssemblies();
// Load the types from any custom plugin assemblies // Load the types from any custom plugin assemblies
LoadCustomPluginTypes(); LoadCustomPluginTypes();
}
} }
} }
} }
/// <summary> /// <summary>