X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/10e7e45ae92d4fe06f70126ed256b87896dbc432..638123eeac3874577ca1454c3420b15dd4ccdbc0:/lib/dvb/pmt.cpp

diff --git a/lib/dvb/pmt.cpp b/lib/dvb/pmt.cpp
index 8364be53..692428d7 100644
--- a/lib/dvb/pmt.cpp
+++ b/lib/dvb/pmt.cpp
@@ -524,8 +524,15 @@ void eDVBServicePMTHandler::SDTScanEvent(int event)
 				eDebug("no channel list");
 			else
 			{
-				m_dvb_scan->insertInto(db, true);
-				eDebug("sdt update done!");
+				eDVBChannelID chid;
+				m_reference.getChannelID(chid);
+				if (chid == m_dvb_scan->getCurrentChannelID())
+				{
+					m_dvb_scan->insertInto(db, true);
+					eDebug("sdt update done!");
+				}
+				else
+					eDebug("ignore sdt update data.... incorrect transponder tuned!!!");
 			}
 			break;
 		}
@@ -605,7 +612,7 @@ int eDVBServicePMTHandler::tune(eServiceReferenceDVB &ref, int use_decode_demux,
 
 			if (ref.path.empty())
 			{
-				delete m_dvb_scan;
+				m_dvb_scan = 0;
 				m_dvb_scan = new eDVBScan(m_channel, true, false);
 				m_dvb_scan->connectEvent(slot(*this, &eDVBServicePMTHandler::SDTScanEvent), m_scan_event_connection);
 			}
@@ -631,7 +638,6 @@ int eDVBServicePMTHandler::tune(eServiceReferenceDVB &ref, int use_decode_demux,
 void eDVBServicePMTHandler::free()
 {
 	m_dvb_scan = 0;
-	delete m_dvb_scan;
 
 	if (m_ca_servicePtr)
 	{
@@ -671,10 +677,10 @@ ChannelMap eDVBCAService::exist_channels;
 ePtr<eConnection> eDVBCAService::m_chanAddedConn;
 
 eDVBCAService::eDVBCAService()
-	: m_prev_build_hash(0), m_sendstate(0), m_retryTimer(eApp)
+	: m_prev_build_hash(0), m_sendstate(0), m_retryTimer(eTimer::create(eApp))
 {
 	memset(m_used_demux, 0xFF, sizeof(m_used_demux));
-	CONNECT(m_retryTimer.timeout, eDVBCAService::sendCAPMT);
+	CONNECT(m_retryTimer->timeout, eDVBCAService::sendCAPMT);
 	Connect();
 }
 
@@ -1040,11 +1046,11 @@ void eDVBCAService::sendCAPMT()
 		{
 			case 0xFFFFFFFF:
 				++m_sendstate;
-				m_retryTimer.start(0,true);
+				m_retryTimer->start(0,true);
 //				eDebug("[eDVBCAService] send failed .. immediate retry");
 				break;
 			default:
-				m_retryTimer.start(5000,true);
+				m_retryTimer->start(5000,true);
 //				eDebug("[eDVBCAService] send failed .. retry in 5 sec");
 				break;
 		}