    {
      if (m_testmode)
 diff --git a/xbmc/Application.cpp b/xbmc/Application.cpp
-index 8fe1ed5da5..72646efaf7 100644
+index 8fe1ed5da5..256bfc1fc8 100644
 --- a/xbmc/Application.cpp
 +++ b/xbmc/Application.cpp
 @@ -258,6 +258,7 @@ CApplication::CApplication(void)

   , m_bEnableLegacyRes(false)
   , m_bTestMode(false)
   , m_bSystemScreenSaverEnable(false)
@@ -4004,10 +4005,13 @@ bool CApplication::OnMessage(CGUIMessage& message)
 
       if (!m_appPlayer.IsPlayingVideo())
       {

diff --git a/xbmc/AppParamParser.cpp b/xbmc/AppParamParser.cpp
index 31f671f7b3..406283eed4 100644
--- a/xbmc/AppParamParser.cpp
