X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/6be1d64932f7007baa7974f72724a97dd6c7304e..3aeae44ab4224e9695f1304478dcfccd6b77a7cd:/lib/dvb/scan.cpp

diff --git a/lib/dvb/scan.cpp b/lib/dvb/scan.cpp
index f49607c2..8b895dc9 100644
--- a/lib/dvb/scan.cpp
+++ b/lib/dvb/scan.cpp
@@ -283,14 +283,33 @@ void eDVBScan::addChannelToScan(const eDVBChannelID &chid, iDVBFrontendParameter
 	}
 	}
 
+	int found_count=0;
 		/* ... in the list of channels to scan */
-	for (std::list<ePtr<iDVBFrontendParameters> >::iterator i(m_ch_toScan.begin()); i != m_ch_toScan.end(); ++i)
+	for (std::list<ePtr<iDVBFrontendParameters> >::iterator i(m_ch_toScan.begin()); i != m_ch_toScan.end();)
+	{
 		if (sameChannel(*i, feparm))
 		{
-			*i = feparm;  // update
-			eDebug("update");
-			return;
+			if (!found_count)
+			{
+				*i = feparm;  // update
+				eDebug("update");
+			}
+			else
+			{
+				eDebug("remove dupe");
+				m_ch_toScan.erase(i++);
+				continue;
+			}
+			++found_count;
 		}
+		++i;
+	}
+
+	if (found_count > 0)
+	{
+		eDebug("already in todo list");
+		return;
+	}
 
 		/* ... in the list of successfully scanned channels */
 	for (std::list<ePtr<iDVBFrontendParameters> >::const_iterator i(m_ch_scanned.begin()); i != m_ch_scanned.end(); ++i)
@@ -489,9 +508,23 @@ void eDVBScan::channelDone()
 	if (!m_chid_current)
 		eWarning("SCAN: the current channel's ID was not corrected - not adding channel.");
 	else
+	{
 		addKnownGoodChannel(m_chid_current, m_ch_current);
 	
-	m_ch_scanned.push_back(m_ch_current);
+		m_ch_scanned.push_back(m_ch_current);
+
+		for (std::list<ePtr<iDVBFrontendParameters> >::iterator i(m_ch_toScan.begin()); i != m_ch_toScan.end();)
+		{
+			if (sameChannel(*i, m_ch_current))
+			{
+				eDebug("remove dupe 2");
+				m_ch_toScan.erase(i++);
+				continue;
+			}
+			++i;
+		}
+	}
+
 	nextChannel();
 }
 
@@ -510,7 +543,7 @@ void eDVBScan::start(const eSmartPtrList<iDVBFrontendParameters> &known_transpon
 		bool exist=false;
 		for (std::list<ePtr<iDVBFrontendParameters> >::const_iterator ii(m_ch_toScan.begin()); ii != m_ch_toScan.end(); ++ii)
 		{
-			if (sameChannel(*i, *ii))
+			if (sameChannel(*i, *ii, true))
 			{
 				exist=true;
 				break;