Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

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
@FernetMenta FernetMenta authored
View
5 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)
Please sign in to comment.
Something went wrong with that request. Please try again.