X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/3e14b0b12f6ffed09d20f5e4d9ddb995728ff9f5..dbe120313d2b4589e3c7ebe49ee98586a2b04e16:/lib/dvb/dvb.cpp

diff --git a/lib/dvb/dvb.cpp b/lib/dvb/dvb.cpp
index ba76a40d..9d5a68aa 100644
--- a/lib/dvb/dvb.cpp
+++ b/lib/dvb/dvb.cpp
@@ -432,9 +432,16 @@ RESULT eDVBResourceManager::allocatePVRChannel(eUsePtr<iDVBPVRChannel> &channel)
 {
 	ePtr<eDVBAllocatedDemux> demux;
 
+	if (m_cached_channel && m_releaseCachedChannelTimer.isActive())
+	{
+		m_cached_channel_state_changed_conn.disconnect();
+		m_cached_channel=0;
+		m_releaseCachedChannelTimer.stop();
+	}
+
 	eDVBChannel *ch;
 	ch = new eDVBChannel(this, 0);
-	
+
 	channel = ch;
 	return 0;
 }
@@ -1038,10 +1045,7 @@ RESULT eDVBChannel::playFile(const char *file)
 		eDebug("can't open /dev/misc/pvr - you need to buy the new(!) $$$ box! (%m)"); // or wait for the driver to be improved.
 		return -ENODEV;
 	}
-	
-	m_state = state_ok;
-	m_stateChanged(this);
-	
+
 	m_pvr_thread = new eFilePushThread();
 	m_pvr_thread->enablePVRCommit(1);
 	m_pvr_thread->setScatterGather(this);
@@ -1055,6 +1059,9 @@ RESULT eDVBChannel::playFile(const char *file)
 	}
 	CONNECT(m_pvr_thread->m_event, eDVBChannel::pvrEvent);
 
+	m_state = state_ok;
+	m_stateChanged(this);
+
 	return 0;
 }