X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/3bad22d5566624804a73b3791980bab2d84c8266..acab01604673e3fb0d13e47f9ffb5c32e8d9dd07:/lib/dvb/esection.cpp

diff --git a/lib/dvb/esection.cpp b/lib/dvb/esection.cpp
index 42a056d2..78db9015 100644
--- a/lib/dvb/esection.cpp
+++ b/lib/dvb/esection.cpp
@@ -57,15 +57,26 @@ RESULT eGTable::start(iDVBSectionReader *reader, const eDVBTableSpec &table)
 	if (m_table.flags & eDVBTableSpec::tfHaveTID)
 	{
 		mask.data[0] = m_table.tid;
-		mask.mask[0] = 0xFF;
+		if (m_table.flags & eDVBTableSpec::tfHaveTIDMask)
+			mask.mask[0] = m_table.tid_mask;
+		else
+			mask.mask[0] = 0xFF;
 	}
-	
+
 	if (m_table.flags & eDVBTableSpec::tfHaveTIDExt)
 	{
 		mask.data[1] = m_table.tidext >> 8;
 		mask.data[2] = m_table.tidext;
-		mask.mask[1] = 0xFF;
-		mask.mask[2] = 0xFF;
+		if (m_table.flags & eDVBTableSpec::tfHaveTIDExtMask)
+		{
+			mask.mask[1] = m_table.tidext_mask >> 8;
+			mask.mask[2] = m_table.tidext_mask;
+		}
+		else
+		{
+			mask.mask[1] = 0xFF;
+			mask.mask[2] = 0xFF;
+		}
 	}
 	
 	if (!(m_table.flags & eDVBTableSpec::tfAnyVersion))
@@ -97,7 +108,6 @@ RESULT eGTable::start(iDVBSectionReader *reader, const eDVBTableSpec &table)
 	
 	if (m_table.flags & eDVBTableSpec::tfHaveTimeout)
 	{
-		eDebug("have timeout, %d", m_table.timeout);
 		if (m_timeout)
 			delete m_timeout;
 		m_timeout = new eTimer(eApp);