Skip to content
This repository
Browse code

Merge pull request #2757 from FernetMenta/pvrstream

pvr: fix channel switch for addons using other stream
  • Loading branch information...
commit 2ccc82cfd2a683c63cdba82415f083c31142374b 2 parents f0f4def + 2e18d81
Rainer Hochecker authored May 25, 2013
5  xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStreamPVRManager.cpp
@@ -315,8 +315,9 @@ CDVDInputStream::ENextStream CDVDInputStreamPVRManager::NextStream()
315 315
 
316 316
   m_eof = IsEOF();
317 317
 
318  
-  if (m_pOtherStream)
319  
-    return m_pOtherStream->NextStream();
  318
+  CDVDInputStream::ENextStream next;
  319
+  if (m_pOtherStream && ((next = m_pOtherStream->NextStream()) != NEXTSTREAM_NONE))
  320
+    return next;
320 321
   else if(m_pFile->SkipNext())
321 322
   {
322 323
     if (m_eof)

0 notes on commit 2ccc82c

Please sign in to comment.
Something went wrong with that request. Please try again.