release cached channel when its no more used and a pvr channel request is pending

1 files changed, 8 insertions, 1 deletions

diff --git a/lib/dvb/dvb.cpp b/lib/dvb/dvb.cpp
index ba76a40d..55aa6ea9 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;
 }