From 44e0351dc04a1f4194424eadb75ea0ef68b15628 Mon Sep 17 00:00:00 2001
From: Andreas Monzner <andreas.monzner@multimedia-labs.de>
Date: Fri, 3 Feb 2006 23:05:05 +0000
Subject: [PATCH] fix cached channel handling

---
 lib/dvb/dvb.cpp | 11 ++++++++++-
 lib/dvb/dvb.h   |  1 +
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/lib/dvb/dvb.cpp b/lib/dvb/dvb.cpp
index 8f4022ec..f2469365 100644
--- a/lib/dvb/dvb.cpp
+++ b/lib/dvb/dvb.cpp
@@ -310,6 +310,7 @@ RESULT eDVBResourceManager::allocateChannel(const eDVBChannelID &channelid, eUse
 			channel = m_cached_channel;
 			return 0;
 		}
+		m_cached_channel_state_changed_conn.disconnect();
 		m_cached_channel=0;
 	}
 
@@ -358,7 +359,8 @@ RESULT eDVBResourceManager::allocateChannel(const eDVBChannelID &channelid, eUse
 		return errChidNotFound;
 	}
 	m_cached_channel = channel = ch;
-	CONNECT(ch->m_stateChanged,eDVBResourceManager::DVBChannelStateChanged);
+	m_cached_channel_state_changed_conn =
+		CONNECT(ch->m_stateChanged,eDVBResourceManager::DVBChannelStateChanged);
 
 	return 0;
 }
@@ -390,6 +392,7 @@ void eDVBResourceManager::DVBChannelStateChanged(iDVBChannel *chan)
 void eDVBResourceManager::releaseCachedChannel()
 {
 	eDebug("release cached channel");
+	m_cached_channel_state_changed_conn.disconnect();
 	m_cached_channel=0;
 }
 
@@ -398,7 +401,10 @@ RESULT eDVBResourceManager::allocateRawChannel(eUsePtr<iDVBChannel> &channel, in
 	ePtr<eDVBAllocatedFrontend> fe;
 
 	if (m_cached_channel)
+	{
+		m_cached_channel_state_changed_conn.disconnect();
 		m_cached_channel=0;
+	}
 
 	if (allocateFrontendByIndex(fe, frontend_index))
 		return errNoFrontend;
@@ -416,7 +422,10 @@ RESULT eDVBResourceManager::allocatePVRChannel(eUsePtr<iDVBPVRChannel> &channel)
 	ePtr<eDVBAllocatedDemux> demux;
 
 	if (m_cached_channel)
+	{
+		m_cached_channel_state_changed_conn.disconnect();
 		m_cached_channel=0;
+	}
 
 	eDVBChannel *ch;
 	ch = new eDVBChannel(this, 0);
diff --git a/lib/dvb/dvb.h b/lib/dvb/dvb.h
index 15e27536..8b0a3595 100644
--- a/lib/dvb/dvb.h
+++ b/lib/dvb/dvb.h
@@ -167,6 +167,7 @@ class eDVBResourceManager: public iObject, public Object
 	bool canAllocateFrontend(ePtr<iDVBFrontendParameters> &feparm);
 
 	eUsePtr<iDVBChannel> m_cached_channel;
+	Connection m_cached_channel_state_changed_conn;
 	eTimer m_releaseCachedChannelTimer;
 	void DVBChannelStateChanged(iDVBChannel*);
 	void releaseCachedChannel();
-- 
2.30.2