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

Merge branch 'dev' of https://github.com/hatharry/Emby.git

Browse Source
This commit is contained in:
hatharry
2016-08-29 01:27:43 +12:00
parent e564b54686 c974641a35
commit cabf2cdc1b
346 changed files with 7936 additions and 5614 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
MediaBrowser.ServerApplication/MainStartup.cs
View File

@@ -19,7 +19,6 @@ using System.Threading;
using System.Threading.Tasks;
using System.Windows.Forms;
using CommonIO.Windows;
using Emby.Drawing.ImageMagick;
using ImageMagickSharp;
using MediaBrowser.Common.Net;
using MediaBrowser.Server.Implementations.Logging;
@@ -166,7 +165,7 @@ namespace MediaBrowser.ServerApplication
{
_logger.Info("Found a duplicate process. Giving it time to exit.");
if (!duplicate.WaitForExit(15000))
if (!duplicate.WaitForExit(20000))
{
_logger.Info("The duplicate process did not exit.");
return true;
@@ -639,6 +638,12 @@ namespace MediaBrowser.ServerApplication
private static void ShutdownWindowsApplication()
{
if (_serverNotifyIcon != null)
{
_serverNotifyIcon.Dispose();
_serverNotifyIcon = null;
}
//_logger.Info("Calling Application.Exit");
//Application.Exit();