lgladsden/jellyfin-server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixes #166 - Multiple instance crash.

Browse Source
This commit is contained in:
Luke Pulverenti 2013-04-23 10:53:43 -04:00
parent 4a100452cf
commit 57dd61d209
1 changed files with 24 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
MediaBrowser.ServerApplication/App.xaml.cs
View File

@ -24,12 +24,27 @@ namespace MediaBrowser.ServerApplication
/// </summary> /// </summary>
public partial class App : Application public partial class App : Application
{ {
/// <summary>
/// The single instance mutex
/// </summary>
private static Mutex _singleInstanceMutex;
/// <summary> /// <summary>
/// Defines the entry point of the application. /// Defines the entry point of the application.
/// </summary> /// </summary>
[STAThread] [STAThread]
public static void Main() public static void Main()
{ {
bool createdNew;
_singleInstanceMutex = new Mutex(true, @"Local\" + typeof(App).Assembly.GetName().Name, out createdNew);
if (!createdNew)
{
_singleInstanceMutex = null;
return;
}
// Look for the existence of an update archive // Look for the existence of an update archive
var appPaths = new ServerApplicationPaths(); var appPaths = new ServerApplicationPaths();
var updateArchive = Path.Combine(appPaths.TempUpdatePath, Constants.MbServerPkgName + ".zip"); var updateArchive = Path.Combine(appPaths.TempUpdatePath, Constants.MbServerPkgName + ".zip");
@ -66,11 +81,6 @@ namespace MediaBrowser.ServerApplication
} }
} }
/// <summary>
/// The single instance mutex
/// </summary>
private Mutex SingleInstanceMutex;
/// <summary> /// <summary>
/// Gets or sets the logger. /// Gets or sets the logger.
/// </summary> /// </summary>
@ -107,15 +117,6 @@ namespace MediaBrowser.ServerApplication
/// <param name="e">A <see cref="T:System.Windows.StartupEventArgs" /> that contains the event data.</param> /// <param name="e">A <see cref="T:System.Windows.StartupEventArgs" /> that contains the event data.</param>
protected override void OnStartup(StartupEventArgs e) protected override void OnStartup(StartupEventArgs e)
{ {
bool createdNew;
SingleInstanceMutex = new Mutex(true, @"Local\" + GetType().Assembly.GetName().Name, out createdNew);
if (!createdNew)
{
SingleInstanceMutex = null;
Shutdown();
return;
}
AppDomain.CurrentDomain.UnhandledException += CurrentDomain_UnhandledException; AppDomain.CurrentDomain.UnhandledException += CurrentDomain_UnhandledException;
LoadKernel(); LoadKernel();
@ -190,7 +191,10 @@ namespace MediaBrowser.ServerApplication
base.OnExit(e); base.OnExit(e);
CompositionRoot.Dispose(); if (CompositionRoot != null)
{
CompositionRoot.Dispose();
}
} }
/// <summary> /// <summary>
@ -198,15 +202,15 @@ namespace MediaBrowser.ServerApplication
/// </summary> /// </summary>
private void ReleaseMutex() private void ReleaseMutex()
{ {
if (SingleInstanceMutex == null) if (_singleInstanceMutex == null)
{ {
return; return;
} }
SingleInstanceMutex.ReleaseMutex(); _singleInstanceMutex.ReleaseMutex();
SingleInstanceMutex.Close(); _singleInstanceMutex.Close();
SingleInstanceMutex.Dispose(); _singleInstanceMutex.Dispose();
SingleInstanceMutex = null; _singleInstanceMutex = null;
} }
/// <summary> /// <summary>