diff options
| author | Kai Sommerfeld <kai.sommerfeld@gmx.com> | 2015-09-27 19:14:52 +0200 |
|---|---|---|
| committer | Kai Sommerfeld <kai.sommerfeld@gmx.com> | 2015-09-27 19:14:52 +0200 |
| commit | f42c66f130805765b0c30d947980d5f2af847cde (patch) | |
| tree | 902be7925adafb2757ec64213b305e598222805d | |
| parent | 6a1285a31ef933c12554fc6a003f937924aa5062 (diff) | |
| parent | 3ba67f183491ff4c5653b4e24e27691811101c15 (diff) | |
Merge pull request #8134 from ksooo/partially-revert-pr6566
Revert "[pvr] changed: also use CACHESTATE_PVR in dvdplayer when play…
| -rw-r--r-- | xbmc/cores/dvdplayer/DVDPlayer.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/xbmc/cores/dvdplayer/DVDPlayer.cpp b/xbmc/cores/dvdplayer/DVDPlayer.cpp index 5a838fda52..2e7ad75c53 100644 --- a/xbmc/cores/dvdplayer/DVDPlayer.cpp +++ b/xbmc/cores/dvdplayer/DVDPlayer.cpp @@ -4784,7 +4784,6 @@ bool CDVDPlayer::SwitchChannel(const CPVRChannelPtr &channel) bool CDVDPlayer::CachePVRStream(void) const { return m_pInputStream->IsStreamType(DVDSTREAM_TYPE_PVRMANAGER) && - (!g_PVRManager.IsPlayingRecording() || - (m_item.HasPVRRecordingInfoTag() && m_item.GetPVRRecordingInfoTag()->IsBeingRecorded()))&& + !g_PVRManager.IsPlayingRecording() && g_advancedSettings.m_bPVRCacheInDvdPlayer; } |