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

Merge pull request #81 from PepperDash/bugfix/load-plugins-crash-with-no-plugins

Browse Source 
Added condition to check for _loadedPluginsDirectoryPath when loading plugins
This commit is contained in:
Andrew Welker
2020-03-30 10:52:22 -06:00
committed by GitHub
parent 5272f84507 b335617e37
commit aaf6d0a21a
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>