pvr: fix channel switch for addons using other stream

xbmc · Oct 26, 2013 · 2284a23 · 2284a23
1 parent efbb36f
commit 2284a23
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStreamPVRManager.cpp b/xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStreamPVRManager.cpp
@@ -315,8 +315,9 @@ CDVDInputStream::ENextStream CDVDInputStreamPVRManager::NextStream()
 
   m_eof = IsEOF();
 
-  if (m_pOtherStream)
-    return m_pOtherStream->NextStream();
+  CDVDInputStream::ENextStream next;
+  if (m_pOtherStream && ((next = m_pOtherStream->NextStream()) != NEXTSTREAM_NONE))
+    return next;
   else if(m_pFile->SkipNext())
   {
     if (m_eof)