aboutsummaryrefslogtreecommitdiff
path: root/lib/dvb/dvb.cpp
diff options
context:
space:
mode:
authorFelix Domke <tmbinc@elitedvb.net>2008-06-08 21:02:29 +0000
committerFelix Domke <tmbinc@elitedvb.net>2008-06-08 21:02:29 +0000
commit30e53d8378cc256fcdefa303b9e5772fd3fc4254 (patch)
treec31926a6136dea64a908ab88ab2d487565f7ee94 /lib/dvb/dvb.cpp
parent485ab51b143b6308bc96f3c0028534c5961cdfb0 (diff)
downloadenigma2-30e53d8378cc256fcdefa303b9e5772fd3fc4254.tar.gz
enigma2-30e53d8378cc256fcdefa303b9e5772fd3fc4254.zip
m_pvr_thread might be zero, handle this correctly.
Diffstat (limited to 'lib/dvb/dvb.cpp')
-rw-r--r--lib/dvb/dvb.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/dvb/dvb.cpp b/lib/dvb/dvb.cpp
index 41c4f3ca..f5ca483e 100644
--- a/lib/dvb/dvb.cpp
+++ b/lib/dvb/dvb.cpp
@@ -1023,6 +1023,9 @@ void eDVBChannel::pvrEvent(int event)
void eDVBChannel::cueSheetEvent(int event)
{
+ /* we might end up here if playing failed or stopped, but the client hasn't (yet) noted. */
+ if (!m_pvr_thread)
+ return;
switch (event)
{
case eCueSheet::evtSeek:
@@ -1060,7 +1063,6 @@ void eDVBChannel::cueSheetEvent(int event)
m_skipmode_n = m_skipmode_m = 0;
}
}
- ASSERT(m_pvr_thread);
m_pvr_thread->setIFrameSearch(m_skipmode_n != 0);
if (m_cue->m_skipmode_ratio != 0)
m_pvr_thread->setTimebaseChange(0x10000 * 9000 / (m_cue->m_skipmode_ratio / 10)); /* negative values are also ok */