alteropen/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2026-03-18 08:06:35 +00:00
Code Issues Actions 7 Packages Projects Releases Wiki Activity

fix web socket message name for library change

Browse Source
This commit is contained in:
Luke Pulverenti
2013-10-06 14:48:04 -04:00
parent 6e58ae31bd
commit bd5bf32aba
5 changed files with 35 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
MediaBrowser.ServerApplication/MainStartup.cs
View File

@@ -1,5 +1,4 @@
using System.Runtime.InteropServices;
using MediaBrowser.Common.Constants;
using MediaBrowser.Common.Constants;
using MediaBrowser.Common.Implementations.Logging;
using MediaBrowser.Common.Implementations.Updates;
using MediaBrowser.Controller.IO;
@@ -13,6 +12,7 @@ using System.Configuration.Install;
using System.Diagnostics;
using System.IO;
using System.Linq;
using System.Runtime.InteropServices;
using System.ServiceProcess;
using System.Windows;
@@ -251,9 +251,7 @@ namespace MediaBrowser.ServerApplication
if (_isRestarting)
{
using (var process = Process.Start("cmd", "/c net start " + BackgroundService.Name))
{
}
Process.Start("cmd", "/c net start " + BackgroundService.Name);
_logger.Info("New service process started");
}
@@ -383,6 +381,8 @@ namespace MediaBrowser.ServerApplication
_logger.ErrorException("UnhandledException", exception);
_appHost.LogManager.Flush();
if (!_isRunningAsService)
{
_app.OnUnhandledException(exception);
@@ -390,7 +390,7 @@ namespace MediaBrowser.ServerApplication
if (!Debugger.IsAttached)
{
Environment.Exit(System.Runtime.InteropServices.Marshal.GetHRForException(exception));
Environment.Exit(Marshal.GetHRForException(exception));
}
}
@@ -411,13 +411,16 @@ namespace MediaBrowser.ServerApplication
// Update is there - execute update
try
{
new ApplicationUpdater().UpdateApplication(MBApplication.MBServer, appPaths, updateArchive);
var serviceName = _isRunningAsService ? BackgroundService.Name : string.Empty;
new ApplicationUpdater().UpdateApplication(MBApplication.MBServer, appPaths, updateArchive, logger, serviceName);
// And just let the app exit so it can update
return true;
}
catch (Exception e)
{
logger.ErrorException("Error starting updater.", e);
MessageBox.Show(string.Format("Error attempting to update application.\n\n{0}\n\n{1}", e.GetType().Name, e.Message));
}
}