Merge branch 'master' of https://github.com/MediaBrowser/MediaBrowser

Conflicts:
	MediaBrowser.ServerApplication/CorePlugins/MediaBrowser.Api.dll
	MediaBrowser.ServerApplication/CorePlugins/MediaBrowser.ApiInteraction.Javascript.dll
	MediaBrowser.ServerApplication/CorePlugins/MediaBrowser.Server.Sqlite.dll
	MediaBrowser.ServerApplication/CorePlugins/MediaBrowser.Server.WorldWeatherOnline.dll
	MediaBrowser.ServerApplication/CorePlugins/MediaBrowser.WebDashboard.dll

1 files changed, 8 insertions, 27 deletions

diff --git a/MediaBrowser.Common/ScheduledTasks/StartupTrigger.cs b/MediaBrowser.Common/ScheduledTasks/StartupTrigger.cs
index 84775924f..a254d2be9 100644
--- a/MediaBrowser.Common/ScheduledTasks/StartupTrigger.cs
+++ b/MediaBrowser.Common/ScheduledTasks/StartupTrigger.cs
@@ -1,6 +1,4 @@
-using MediaBrowser.Common.Kernel;
-using System;
-using System.Threading.Tasks;
+using System.Threading.Tasks;
 
 namespace MediaBrowser.Common.ScheduledTasks
 {
@@ -10,33 +8,17 @@ namespace MediaBrowser.Common.ScheduledTasks
     public class StartupTrigger : BaseTaskTrigger
     {
         /// <summary>
-        /// Gets the kernel.
-        /// </summary>
-        /// <value>The kernel.</value>
-        protected IKernel Kernel { get; private set; }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="StartupTrigger" /> class.
-        /// </summary>
-        /// <param name="kernel">The kernel.</param>
-        public StartupTrigger(IKernel kernel)
-        {
-            Kernel = kernel;
-        }
-
-        /// <summary>
         /// Stars waiting for the trigger action
         /// </summary>
-        protected internal override void Start()
-        {
-            Kernel.ReloadCompleted += Kernel_ReloadCompleted;
-        }
-
-        async void Kernel_ReloadCompleted(object sender, EventArgs e)
+        /// <param name="isApplicationStartup">if set to <c>true</c> [is application startup].</param>
+        protected internal async override void Start(bool isApplicationStartup)
         {
-            await Task.Delay(2000).ConfigureAwait(false);
+            if (isApplicationStartup)
+            {
+                await Task.Delay(2000).ConfigureAwait(false);
 
-            OnTriggered();
+                OnTriggered();
+            }
         }
 
         /// <summary>
@@ -44,7 +26,6 @@ namespace MediaBrowser.Common.ScheduledTasks
         /// </summary>
         protected internal override void Stop()
         {
-            Kernel.ReloadCompleted -= Kernel_ReloadCompleted;
         }
     }
 }