From 23552c326706f7fb4d7e2a08e7f27514f69a3388 Mon Sep 17 00:00:00 2001
From: Taloth Saldono <Taloth@users.noreply.github.com>
Date: Mon, 19 Jun 2017 23:07:11 +0200
Subject: [PATCH] Tweaked SingleInstancePolicy not to cancel startup if AppData
 is overridden is set.

---
 src/NzbDrone.Host/Bootstrap.cs            |  8 ++++++--
 src/NzbDrone.Host/SingleInstancePolicy.cs | 11 ++++++++++-
 2 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/src/NzbDrone.Host/Bootstrap.cs b/src/NzbDrone.Host/Bootstrap.cs
index 24a151eeb..99deeef58 100644
--- a/src/NzbDrone.Host/Bootstrap.cs
+++ b/src/NzbDrone.Host/Bootstrap.cs
@@ -88,11 +88,15 @@ namespace NzbDrone.Host
         {
             var instancePolicy = _container.Resolve<ISingleInstancePolicy>();
 
-            if (isService)
+            if (startupContext.Flags.Contains(StartupContext.TERMINATE))
             {
                 instancePolicy.KillAllOtherInstance();
             }
-            else if (startupContext.Flags.Contains(StartupContext.TERMINATE))
+            else if (startupContext.Args.ContainsKey(StartupContext.APPDATA))
+            {
+                instancePolicy.WarnIfAlreadyRunning();
+            }
+            else if (isService)
             {
                 instancePolicy.KillAllOtherInstance();
             }
diff --git a/src/NzbDrone.Host/SingleInstancePolicy.cs b/src/NzbDrone.Host/SingleInstancePolicy.cs
index 75b8bb13e..a24f12207 100644
--- a/src/NzbDrone.Host/SingleInstancePolicy.cs
+++ b/src/NzbDrone.Host/SingleInstancePolicy.cs
@@ -10,6 +10,7 @@ namespace NzbDrone.Host
     {
         void PreventStartIfAlreadyRunning();
         void KillAllOtherInstance();
+        void WarnIfAlreadyRunning();
     }
 
     public class SingleInstancePolicy : ISingleInstancePolicy
@@ -45,6 +46,14 @@ namespace NzbDrone.Host
             }
         }
 
+        public void WarnIfAlreadyRunning()
+        {
+            if (IsAlreadyRunning())
+            {
+                _logger.Debug("Another instance of Sonarr is already running.");
+            }
+        }
+
         private bool IsAlreadyRunning()
         {
             return GetOtherNzbDroneProcessIds().Any();
@@ -76,4 +85,4 @@ namespace NzbDrone.Host
             }
         }
     }
-}
\ No newline at end of file
+}