Diff of /xbmc/Application.cpp [0830dd] .. [d18a77] Maximize Restore

Repo status: analyzing...

  Switch to side-by-side view

--- a/xbmc/Application.cpp
+++ b/xbmc/Application.cpp
@@ -563,7 +563,9 @@
   //depending on how it's compiled, SDL periodically calls XResetScreenSaver when it's fullscreen
   //this might bring the monitor out of standby, so we have to disable it explicitly
   //by passing 0 for overwrite to setsenv, the user can still override this by setting the environment variable
+#if defined(_LINUX) && !defined(__APPLE__)
   setenv("SDL_VIDEO_ALLOW_SCREENSAVER", "1", 0);
+#endif
 
 #endif // HAS_SDL
 
@@ -4240,6 +4242,11 @@
 
 void CApplication::CheckScreenSaverAndDPMS()
 {
+#if defined(_LINUX) && !defined(__APPLE__)
+  if (!m_dpmsIsActive)
+    g_Windowing.ResetX11Screensaver();
+#endif
+
   bool maybeScreensaver =
       !m_dpmsIsActive && !m_bScreenSave
       && !g_guiSettings.GetString("screensaver.mode").IsEmpty();