Merge pull request #13824 from FernetMenta/strm

VideoPlayer: flush renderManager when hiding video

1 files changed, 8 insertions, 0 deletions

diff --git a/xbmc/cores/VideoPlayer/VideoRenderers/RenderManager.cpp b/xbmc/cores/VideoPlayer/VideoRenderers/RenderManager.cpp
index 78e1e08f0c..4b63322f88 100644
--- a/xbmc/cores/VideoPlayer/VideoRenderers/RenderManager.cpp
+++ b/xbmc/cores/VideoPlayer/VideoRenderers/RenderManager.cpp
@@ -264,6 +264,8 @@ bool CRenderManager::IsConfigured() const
 void CRenderManager::ShowVideo(bool enable)
 {
   m_showVideo = enable;
+  if (!enable)
+    Flush(false);
 }
 
 void CRenderManager::FrameWait(int ms)
@@ -355,6 +357,12 @@ void CRenderManager::FrameMove()
 
 void CRenderManager::PreInit()
 {
+  {
+    CSingleLock lock(m_statelock);
+    if (m_renderState != STATE_UNCONFIGURED)
+      return;
+  }
+
   if (!g_application.IsCurrentThread())
   {
     m_initEvent.Reset();