From a31beab372fea6a9996c47d37d6d24249d3c4881 Mon Sep 17 00:00:00 2001
From: LL <52593730@qq.com>
Date: Fri, 16 Jun 2017 12:13:30 +1200
Subject: [PATCH] apply the settings

---
 ILSpy/App.xaml.cs                   |  4 +++-
 ILSpy/Options/MiscSettingsLoader.cs | 13 +++++++++++++
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/ILSpy/App.xaml.cs b/ILSpy/App.xaml.cs
index 1cdb92ce7..fb8c8974e 100644
--- a/ILSpy/App.xaml.cs
+++ b/ILSpy/App.xaml.cs
@@ -30,6 +30,7 @@ using System.Windows.Navigation;
 using System.Windows.Threading;
 
 using ICSharpCode.ILSpy.TextView;
+using ICSharpCode.ILSpy.Options;
 
 namespace ICSharpCode.ILSpy
 {
@@ -57,8 +58,9 @@ namespace ICSharpCode.ILSpy
 		public App()
 		{
 			var cmdArgs = Environment.GetCommandLineArgs().Skip(1);
+			var allowMultipleInstance = MiscSettingsInstance.Current.LoadMiscSettings().AllowMultipleInstances;
 			App.CommandLineArguments = new CommandLineArguments(cmdArgs);
-			if (App.CommandLineArguments.SingleInstance ?? true) {
+			if ((App.CommandLineArguments.SingleInstance ?? true) && (!allowMultipleInstance)) {
 				cmdArgs = cmdArgs.Select(FullyQualifyPath);
 				string message = string.Join(Environment.NewLine, cmdArgs);
 				if (SendToPreviousInstance("ILSpy:\r\n" + message, !App.CommandLineArguments.NoActivate)) {
diff --git a/ILSpy/Options/MiscSettingsLoader.cs b/ILSpy/Options/MiscSettingsLoader.cs
index f06e9cc2a..dd6f260a5 100644
--- a/ILSpy/Options/MiscSettingsLoader.cs
+++ b/ILSpy/Options/MiscSettingsLoader.cs
@@ -4,11 +4,24 @@ namespace ICSharpCode.ILSpy.Options
 {
 	public interface IMiscSettingsLoader
 	{
+		MiscSettings LoadMiscSettings();
 		MiscSettings LoadMiscSettings(ILSpySettings settings);
 	}
 
 	public class MiscSettingsLoader : IMiscSettingsLoader
 	{
+		private ILSpySettings settings;
+
+		public MiscSettingsLoader()
+		{
+			settings = ILSpySettings.Load();
+		}
+
+		public MiscSettings LoadMiscSettings()
+		{
+			return LoadMiscSettings(settings);
+		}
+
 		public MiscSettings LoadMiscSettings(ILSpySettings settings)
 		{
 			XElement e = settings["MiscSettings"];