Merge pull request #2897 from MediaBrowser/beta

Beta

1 files changed, 1 insertions, 9 deletions

diff --git a/Emby.Server.Implementations/EntryPoints/SystemEvents.cs b/Emby.Server.Implementations/EntryPoints/SystemEvents.cs
index 4ab6d32f3..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();
@@ -43,6 +34,7 @@ namespace Emby.Server.Implementations.EntryPoints
         public void Dispose()
         {
             _systemEvents.SystemShutdown -= _systemEvents_SystemShutdown;
+            GC.SuppressFinalize(this);
         }
     }
 }