Merge branch 'beta'

1 files changed, 15 insertions, 16 deletions

diff --git a/MediaBrowser.Server.Startup.Common/EntryPoints/KeepServerAwake.cs b/MediaBrowser.Server.Startup.Common/EntryPoints/KeepServerAwake.cs
index 20d4c6b2a..dbfd6f4e8 100644
--- a/MediaBrowser.Server.Startup.Common/EntryPoints/KeepServerAwake.cs
+++ b/MediaBrowser.Server.Startup.Common/EntryPoints/KeepServerAwake.cs
@@ -27,28 +27,27 @@ namespace MediaBrowser.Server.Startup.Common.EntryPoints
             _timer = new PeriodicTimer(obj =>
             {
                 var now = DateTime.UtcNow;
-                if (_sessionManager.Sessions.Any(i => (now - i.LastActivityDate).TotalMinutes < 15))
+                var nativeApp = ((ApplicationHost)_appHost).NativeApp;
+
+                try
+                {
+                    if (_sessionManager.Sessions.Any(i => (now - i.LastActivityDate).TotalMinutes < 15))
+                    {
+                        nativeApp.PreventSystemStandby();
+                    }
+                    else
+                    {
+                        nativeApp.AllowSystemStandby();
+                    }
+                }
+                catch (Exception ex)
                 {
-                    KeepAlive();
+                    _logger.ErrorException("Error resetting system standby timer", ex);
                 }
 
             }, null, TimeSpan.FromMinutes(5), TimeSpan.FromMinutes(5));
         }
 
-        private void KeepAlive()
-        {
-            var nativeApp = ((ApplicationHost)_appHost).NativeApp;
-
-            try
-            {
-                nativeApp.PreventSystemStandby();
-            }
-            catch (Exception ex)
-            {
-                _logger.ErrorException("Error resetting system standby timer", ex);
-            }
-        }
-
         public void Dispose()
         {
             if (_timer != null)