X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/894e18128f153afdf0b6ab1785a98b32efa6d798..d63cf373b3e1c357d97d78225a3a48438d1158cc:/lib/dvb/teletext.cpp

diff --git a/lib/dvb/teletext.cpp b/lib/dvb/teletext.cpp
index 7cef7b28..7e1411b2 100644
--- a/lib/dvb/teletext.cpp
+++ b/lib/dvb/teletext.cpp
@@ -521,13 +521,13 @@ void eDVBTeletextParser::handleLine(unsigned char *data, int len)
 
 	if (m_X28_0_valid)
 	{
-		nat_subset = NationalOptionSubsetsLookup[(m_X28_t1 >> 7) & 0xF];
+		nat_subset = NationalOptionSubsetsLookup[(m_X28_t1 >> 7) & 0x7F];
 		nat_subset_2 = NationalOptionSubsetsLookup[((m_X28_t1 >> 14) & 0xF) | ((m_X28_t2 & 7) << 4)];
 //		eDebug("X/28/0 nat_subset %d, nat_subset2 %d", nat_subset, nat_subset_2);
 	}
 	else if (m_M29_0_valid)
 	{
-		nat_subset = NationalOptionSubsetsLookup[(m_M29_t1 >> 7) & 0xF];
+		nat_subset = NationalOptionSubsetsLookup[(m_M29_t1 >> 7) & 0x7F];
 		nat_subset_2 = NationalOptionSubsetsLookup[((m_M29_t1 >> 14) & 0xF) | ((m_M29_t2 & 7) << 4)];
 //		eDebug("M/29/0 nat_subset %d, nat_subset2 %d", nat_subset, nat_subset_2);
 	}
@@ -685,11 +685,10 @@ void eDVBTeletextParser::addSubtitleString(int color, std::string string)
 void eDVBTeletextParser::sendSubtitlePage()
 {
 //	eDebug("subtitle page:");
-	bool empty=true;
-	if (empty)
-		for (unsigned int i = 0; i < m_subtitle_page.m_elements.size(); ++i)
-			if (!m_subtitle_page.m_elements[i].m_text.empty())
-				empty=false;
-	if (!empty)
+	bool send=m_C & (1<<4);
+	for (unsigned int i = 0; i < m_subtitle_page.m_elements.size(); ++i)
+		if (!m_subtitle_page.m_elements[i].m_text.empty())
+			send=true;
+	if (send)
 		m_new_subtitle_page(m_subtitle_page);
 }