aboutsummaryrefslogtreecommitdiff
path: root/MediaBrowser.Common/Kernel/BaseKernel.cs
diff options
context:
space:
mode:
authorLukePulverenti Luke Pulverenti luke pulverenti <LukePulverenti Luke Pulverenti luke.pulverenti@gmail.com>2012-07-29 11:19:25 -0400
committerLukePulverenti Luke Pulverenti luke pulverenti <LukePulverenti Luke Pulverenti luke.pulverenti@gmail.com>2012-07-29 11:19:25 -0400
commit5d88dc857513344a4ecd1b337c1529250e5e2dfa (patch)
tree33142d3b022ab64df737eed584a0a3a723bda6d5 /MediaBrowser.Common/Kernel/BaseKernel.cs
parent77e81432f7ff49fed71677c4f7b0cb8b4acc92e3 (diff)
Configuration and serialization improvements
Diffstat (limited to 'MediaBrowser.Common/Kernel/BaseKernel.cs')
-rw-r--r--MediaBrowser.Common/Kernel/BaseKernel.cs13
1 files changed, 4 insertions, 9 deletions
diff --git a/MediaBrowser.Common/Kernel/BaseKernel.cs b/MediaBrowser.Common/Kernel/BaseKernel.cs
index 3ff07356b..291c67156 100644
--- a/MediaBrowser.Common/Kernel/BaseKernel.cs
+++ b/MediaBrowser.Common/Kernel/BaseKernel.cs
@@ -18,7 +18,7 @@ namespace MediaBrowser.Common.Kernel
/// Represents a shared base kernel for both the UI and server apps
/// </summary>
public abstract class BaseKernel<TConfigurationType>
- where TConfigurationType : BaseConfiguration, new()
+ where TConfigurationType : BaseApplicationConfiguration, new()
{
/// <summary>
/// Gets the path to the program data folder
@@ -139,18 +139,13 @@ namespace MediaBrowser.Common.Kernel
plugin.Version = assemblyName.Version;
plugin.Path = Path.Combine(PluginsPath, assemblyName.Name);
+ plugin.Context = KernelContext;
+
plugin.ReloadConfiguration();
if (plugin.Enabled)
{
- if (KernelContext == KernelContext.Server)
- {
- plugin.InitInServer();
- }
- else
- {
- plugin.InitInUI();
- }
+ plugin.Init();
}
}
}