From: ghost <andreas.monzner@multimedia-labs.de>
Date: Fri, 12 Jun 2009 17:18:29 +0000 (+0200)
Subject: Merge branch 'master' of git.opendreambox.org:/git/enigma2
X-Git-Url: http://code.vuplus.com/gitweb/?a=commitdiff_plain;h=728e5ee06ef8c31a58cadcc2182b060f91a58fa3;hp=fac0559ae32f4acaa6e02f4d05e44979715b4903;p=vuplus_dvbapp

Merge branch 'master' of git.opendreambox.org:/git/enigma2
---

diff --git a/lib/dvb_ci/dvbci.cpp b/lib/dvb_ci/dvbci.cpp
index 0a32b8f..037103c 100644
--- a/lib/dvb_ci/dvbci.cpp
+++ b/lib/dvb_ci/dvbci.cpp
@@ -552,6 +552,7 @@ void eDVBCIInterfaces::removePMTHandler(eDVBServicePMTHandler *pmthandler)
 	if (it != m_pmt_handlers.end())
 	{
 		eDVBCISlot *slot = it->cislot;
+		eDVBCISlot *base_slot = slot;
 		eDVBServicePMTHandler *pmthandler = it->pmthandler;
 		m_pmt_handlers.erase(it);
 
@@ -575,20 +576,17 @@ void eDVBCIInterfaces::removePMTHandler(eDVBServicePMTHandler *pmthandler)
 
 		while(slot)
 		{
+			eDVBCISlot *next = slot->linked_next;
 			if (!sameServiceExist)
 			{
-//				if (slot->getNumOfServices() > 1)
-				{
-					eDebug("[eDVBCIInterfaces] remove last pmt handler for service %s send empty capmt",
-						service_to_remove.toString().c_str());
-						std::vector<uint16_t> caids;
-					caids.push_back(0xFFFF);
-					slot->sendCAPMT(pmthandler, caids);  // send a capmt without caids to remove a running service
-				}
+				eDebug("[eDVBCIInterfaces] remove last pmt handler for service %s send empty capmt",
+					service_to_remove.toString().c_str());
+				std::vector<uint16_t> caids;
+				caids.push_back(0xFFFF);
+				slot->sendCAPMT(pmthandler, caids);  // send a capmt without caids to remove a running service
 				slot->removeService(service_to_remove.getServiceID().get());
 			}
 
-			eDVBCISlot *next = slot->linked_next;
 			if (!--slot->use_count)
 			{
 				if (slot->linked_next)
@@ -596,9 +594,7 @@ void eDVBCIInterfaces::removePMTHandler(eDVBServicePMTHandler *pmthandler)
 				else
 					setInputSource(slot->current_tuner, slot->current_source);
 
-				if (it->cislot == slot) // remove the base slot
-					it->cislot = slot->linked_next;
-				else
+				if (base_slot != slot)
 				{
 					eDVBCISlot *tmp = it->cislot;
 					while(tmp->linked_next != slot)