alteropen/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2026-04-21 17:44:43 +01:00
Code Issues Actions 7 Packages Projects Releases Wiki Activity

fixing merge issue

Browse Source
This commit is contained in:
Luke Pulverenti
2013-03-28 01:19:58 -04:00
parent fab99c51c0
commit 0c58d536e0
4 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
MediaBrowser.ServerApplication/EntryPoints/WebSocketEvents.cs
View File

@@ -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>