X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/0c59a4279f93f08fe95fca5f2e55f3e025f0cceb..bf172c73819b5c577d64afcf86c1eb8852a086a3:/lib/dvb/pmt.cpp

diff --git a/lib/dvb/pmt.cpp b/lib/dvb/pmt.cpp
index 80fbcab3..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)
 	{