Merge pull request #3897 from wsoltys/screensaverfix2

[WIN32] changed: set background mode when minimized. prevents screen saver from kicking in.

2 files changed, 3 insertions, 5 deletions

diff --git a/xbmc/Application.cpp b/xbmc/Application.cpp
index 387f0d4158..ace6d416ee 100644
--- a/xbmc/Application.cpp
+++ b/xbmc/Application.cpp
@@ -5130,11 +5130,6 @@ void CApplication::ProcessSlow()
 
   CAEFactory::GarbageCollect();
 
-  // if we don't render the gui there's no reason to start the screensaver.
-  // that way the screensaver won't kick in if we maximize the XBMC window
-  // after the screensaver start time.
-  if(!m_renderGUI)
-    ResetScreenSaverTimer();
 }
 
 // Global Idle Time in Seconds
diff --git a/xbmc/windowing/windows/WinEventsWin32.cpp b/xbmc/windowing/windows/WinEventsWin32.cpp
index 5933fd8d59..e3a46387b0 100644
--- a/xbmc/windowing/windows/WinEventsWin32.cpp
+++ b/xbmc/windowing/windows/WinEventsWin32.cpp
@@ -473,7 +473,10 @@ LRESULT CALLBACK CWinEventsWin32::WndProc(HWND hWnd, UINT uMsg, WPARAM wParam, L
           }
         }
         if (g_application.GetRenderGUI() != active)
+        {
           g_Windowing.NotifyAppActiveChange(g_application.GetRenderGUI());
+          g_application.SetInBackground(!g_application.GetRenderGUI());
+        }
         CLog::Log(LOGDEBUG, __FUNCTION__"Window is %s", g_application.GetRenderGUI() ? "active" : "inactive");
       }
       break;