pvr: fix channel switch for addons using other stream
authorRainer Hochecker <fernetmenta@online.de>
Fri, 17 May 2013 07:07:27 +0000 (09:07 +0200)
committerRainer Hochecker <fernetmenta@online.de>
Sat, 18 May 2013 15:42:33 +0000 (17:42 +0200)
xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStreamPVRManager.cpp

index aa3298b..397ea5d 100644 (file)
@@ -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)