Merge pull request #2877 from MediaBrowser/dev

Dev

2 files changed, 0 insertions, 26 deletions

diff --git a/Emby.Server.Implementations/ApplicationHost.cs b/Emby.Server.Implementations/ApplicationHost.cs
index 02308f79f..2b0030152 100644
--- a/Emby.Server.Implementations/ApplicationHost.cs
+++ b/Emby.Server.Implementations/ApplicationHost.cs
@@ -439,14 +439,6 @@ namespace Emby.Server.Implementations
             }
         }
 
-        public virtual bool SupportsRunningAsService
-        {
-            get
-            {
-                return false;
-            }
-        }
-
         private DeviceId _deviceId;
         public string SystemId
         {
@@ -473,14 +465,6 @@ namespace Emby.Server.Implementations
             }
         }
 
-        public virtual bool IsRunningAsService
-        {
-            get
-            {
-                return false;
-            }
-        }
-
         private Assembly GetAssembly(Type type)
         {
             return type.GetTypeInfo().Assembly;
@@ -1910,7 +1894,6 @@ namespace Emby.Server.Implementations
                 HasUpdateAvailable = HasUpdateAvailable,
                 SupportsAutoRunAtStartup = SupportsAutoRunAtStartup,
                 TranscodingTempPath = ApplicationPaths.TranscodingTempPath,
-                SupportsRunningAsService = SupportsRunningAsService,
                 ServerName = FriendlyName,
                 LocalAddress = localAddress,
                 SupportsLibraryMonitor = true,
diff --git a/Emby.Server.Implementations/EntryPoints/SystemEvents.cs b/Emby.Server.Implementations/EntryPoints/SystemEvents.cs
index aa63dae27..08f3edb3d 100644
--- a/Emby.Server.Implementations/EntryPoints/SystemEvents.cs
+++ b/Emby.Server.Implementations/EntryPoints/SystemEvents.cs
@@ -23,18 +23,9 @@ namespace Emby.Server.Implementations.EntryPoints
 
         public void Run()
         {
-            _systemEvents.SessionLogoff += _systemEvents_SessionLogoff;
             _systemEvents.SystemShutdown += _systemEvents_SystemShutdown;
         }
 
-        private void _systemEvents_SessionLogoff(object sender, EventArgs e)
-        {
-            if (!_appHost.IsRunningAsService)
-            {
-                _appHost.Shutdown();
-            }
-        }
-
         private void _systemEvents_SystemShutdown(object sender, EventArgs e)
         {
             _appHost.Shutdown();