App crash fixed when using multiple app instances

BornToBeRoot · BornToBeRoot · commit ebfcfb020124 · 2017-11-23T09:56:25.000+01:00
diff --git a/Source/NETworkManager/App.xaml.cs b/Source/NETworkManager/App.xaml.cs
@@ -60,11 +60,14 @@ private void Application_Startup(object sender, StartupEventArgs e)
 
             // Single instance
             _mutex = new Mutex(true, "{" + Guid + "}");
+            bool mutexIsAcquired = _mutex.WaitOne(TimeSpan.Zero, true);
 
-            if (SettingsManager.Current.Window_MultipleInstances || _mutex.WaitOne(TimeSpan.Zero, true))
+            if (SettingsManager.Current.Window_MultipleInstances || mutexIsAcquired)
             {
                 StartupUri = new Uri("MainWindow.xaml", UriKind.Relative);
-                _mutex.ReleaseMutex();
+
+                if (mutexIsAcquired)
+                    _mutex.ReleaseMutex();
             }
             else
             {

Original file line number	Diff line number	Diff line change
`@@ -60,11 +60,14 @@ private void Application_Startup(object sender, StartupEventArgs e)`
`60`	`60`
`61`	`61`	`// Single instance`
`62`	`62`	`_mutex = new Mutex(true, "{" + Guid + "}");`
	`63`	`+ bool mutexIsAcquired = _mutex.WaitOne(TimeSpan.Zero, true);`
`63`	`64`
`64`		`- if (SettingsManager.Current.Window_MultipleInstances \|\| _mutex.WaitOne(TimeSpan.Zero, true))`
	`65`	`+ if (SettingsManager.Current.Window_MultipleInstances \|\| mutexIsAcquired)`
`65`	`66`	`{`
`66`	`67`	`StartupUri = new Uri("MainWindow.xaml", UriKind.Relative);`
`67`		`- _mutex.ReleaseMutex();`
	`68`	`+`
	`69`	`+ if (mutexIsAcquired)`
	`70`	`+ _mutex.ReleaseMutex();`
`68`	`71`	`}`
`69`	`72`	`else`
`70`	`73`	`{`