Merge branch 'master' of https://github.com/MediaBrowser/MediaBrowser

1 files changed, 10 insertions, 3 deletions

diff --git a/MediaBrowser.ServerApplication/ApplicationHost.cs b/MediaBrowser.ServerApplication/ApplicationHost.cs
index 4b15ca8d0..0609e80ef 100644
--- a/MediaBrowser.ServerApplication/ApplicationHost.cs
+++ b/MediaBrowser.ServerApplication/ApplicationHost.cs
@@ -179,10 +179,16 @@ namespace MediaBrowser.ServerApplication
         /// </summary>
         /// <param name="applicationPaths">The application paths.</param>
         /// <param name="logManager">The log manager.</param>
-        public ApplicationHost(ServerApplicationPaths applicationPaths, ILogManager logManager)
+        public ApplicationHost(ServerApplicationPaths applicationPaths, ILogManager logManager, bool isRunningAsService)
             : base(applicationPaths, logManager)
         {
+            _isRunningAsService = isRunningAsService;
+        }
 
+        private readonly bool _isRunningAsService;
+        public override bool IsRunningAsService
+        {
+            get { return _isRunningAsService; }
         }
 
         /// <summary>
@@ -431,7 +437,7 @@ namespace MediaBrowser.ServerApplication
             await ItemRepository.Initialize().ConfigureAwait(false);
 
             await ProviderRepository.Initialize().ConfigureAwait(false);
-            
+
             ((LibraryManager)LibraryManager).ItemRepository = ItemRepository;
         }
 
@@ -687,7 +693,8 @@ namespace MediaBrowser.ServerApplication
                 WanAddress = GetWanAddress(),
                 HasUpdateAvailable = _hasUpdateAvailable,
                 SupportsAutoRunAtStartup = SupportsAutoRunAtStartup,
-                TranscodingTempPath = ApplicationPaths.TranscodingTempPath
+                TranscodingTempPath = ApplicationPaths.TranscodingTempPath,
+                IsRunningAsService = IsRunningAsService
             };
         }