TEST: also disable autoscrolling while opening streams.

popcornmix · Jan 3, 2015 · dd57a6f · dd57a6f
1 parent 7f55deb
commit dd57a6f
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/xbmc/Application.cpp b/xbmc/Application.cpp
@@ -5904,7 +5904,10 @@ void CApplication::CloseNetworkShares()
 
 bool CApplication::ScreenSaverDisablesAutoScrolling()
 {
-  return IsInScreenSaver() && m_screenSaver &&
+  bool onBlackDimScreenSaver = IsInScreenSaver() && m_screenSaver &&
     (m_screenSaver->ID() == "screensaver.xbmc.builtin.black" ||
      m_screenSaver->ID() == "screensaver.xbmc.builtin.dim");
+  bool openingStreams = m_pPlayer->IsPlaying() && g_windowManager.IsWindowActive(WINDOW_DIALOG_BUSY);
+
+  return onBlackDimScreenSaver || openingStreams;
 }