From 1d087a96b14372535440080bbe56f9605484b6b0 Mon Sep 17 00:00:00 2001 From: jmarshallnz Date: Fri, 2 May 2014 18:04:10 +1200 Subject: [PATCH] Merge pull request #4623 from FernetMenta/background Revert "[WIN32] changed: set background mode when minimized. prevents sc... --- xbmc/Application.cpp | 5 +++++ xbmc/windowing/windows/WinEventsWin32.cpp | 3 --- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/xbmc/Application.cpp b/xbmc/Application.cpp index 203e69d..b7eaca3 100644 --- a/xbmc/Application.cpp +++ b/xbmc/Application.cpp @@ -5196,6 +5196,11 @@ 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 e3a4638..5933fd8 100644 --- a/xbmc/windowing/windows/WinEventsWin32.cpp +++ b/xbmc/windowing/windows/WinEventsWin32.cpp @@ -473,10 +473,7 @@ 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; -- 2.7.4