From 0c58d536e01df9d2a5c9a3986686c988cf467baa Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Thu, 28 Mar 2013 01:19:58 -0400
Subject: fixing merge issue

---
 MediaBrowser.ServerApplication/EntryPoints/WebSocketEvents.cs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'MediaBrowser.ServerApplication/EntryPoints/WebSocketEvents.cs')

diff --git a/MediaBrowser.ServerApplication/EntryPoints/WebSocketEvents.cs b/MediaBrowser.ServerApplication/EntryPoints/WebSocketEvents.cs
index 2ee3193dc..50d625739 100644
--- a/MediaBrowser.ServerApplication/EntryPoints/WebSocketEvents.cs
+++ b/MediaBrowser.ServerApplication/EntryPoints/WebSocketEvents.cs
@@ -88,13 +88,13 @@ namespace MediaBrowser.ServerApplication.EntryPoints
 
         void _taskManager_TaskCompleted(object sender, GenericEventArgs<TaskResult> e)
         {
-            _serverManager.SendWebSocketMessage("ScheduledTaskEndExecute", e.Argument);
+            _serverManager.SendWebSocketMessage("ScheduledTaskEnded", e.Argument);
         }
 
         void _taskManager_TaskExecuting(object sender, EventArgs e)
         {
             var task = (IScheduledTask) sender;
-            _serverManager.SendWebSocketMessage("ScheduledTaskBeginExecute", task.Name);
+            _serverManager.SendWebSocketMessage("ScheduledTaskStarted", task.Name);
         }
 
         /// <summary>
@@ -164,7 +164,7 @@ namespace MediaBrowser.ServerApplication.EntryPoints
         /// <param name="e">The <see cref="EventArgs" /> instance containing the event data.</param>
         void kernel_HasPendingRestartChanged(object sender, EventArgs e)
         {
-            _serverManager.SendWebSocketMessage("HasPendingRestartChanged", _appHost.GetSystemInfo());
+            _serverManager.SendWebSocketMessage("RestartRequired", _appHost.GetSystemInfo());
         }
 
         /// <summary>
-- 
cgit v1.2.3