Fix ResourceMerger

1. Fix duplication for loading resource.
2. Fix null reference when plugin is not loaded.
3. speedup.
This commit is contained in:
bao-qian
2015-11-02 02:49:38 +00:00
parent b5a8312167
commit 881e414043
5 changed files with 43 additions and 27 deletions

View File

@@ -20,6 +20,7 @@ namespace Wox.Core.Plugin
/// </summary>
public static class PluginManager
{
public const string DirectoryName = "Plugins";
private static List<PluginMetadata> pluginMetadatas;
private static List<KeyValuePair<PluginPair, IInstantQuery>> instantSearches;
private static IEnumerable<PluginPair> exclusiveSearchPlugins;
@@ -41,7 +42,7 @@ namespace Wox.Core.Plugin
public static string PluginDirectory
{
get { return Path.Combine(Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location), "Plugins"); }
get { return Path.Combine(Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location), DirectoryName); }
}
private static void SetupPluginDirectories()