From: Felix Domke <felix.domke@multimedia-labs.de>
Date: Sun, 9 Aug 2009 20:58:57 +0000 (+0200)
Subject: Merge branch 'master' of git.opendreambox.org:/git/enigma2
X-Git-Tag: 2.6.0~154
X-Git-Url: https://git.cweiske.de/enigma2.git/commitdiff_plain/ce31b562c29e94d2421e0a2b0257030eca97f1cd?hp=cdaaee0da655f7d08c5cda38877ec798482c9706

Merge branch 'master' of git.opendreambox.org:/git/enigma2
---

diff --git a/lib/service/servicedvb.cpp b/lib/service/servicedvb.cpp
index 5166414f..a75c6cac 100644
--- a/lib/service/servicedvb.cpp
+++ b/lib/service/servicedvb.cpp
@@ -2329,23 +2329,24 @@ void eDVBServicePlay::updateDecoder()
 				m_decoder->connectVideoEvent(slot(*this, &eDVBServicePlay::video_event), m_video_event_connection);
 			if (m_is_primary)
 			{
-				ePyObject subs;
-				if (m_timeshift_changed)
-					subs = getCachedSubtitle();
 				m_teletext_parser = new eDVBTeletextParser(m_decode_demux);
 				m_teletext_parser->connectNewPage(slot(*this, &eDVBServicePlay::newSubtitlePage), m_new_subtitle_page_connection);
 				m_subtitle_parser = new eDVBSubtitleParser(m_decode_demux);
 				m_subtitle_parser->connectNewPage(slot(*this, &eDVBServicePlay::newDVBSubtitlePage), m_new_dvb_subtitle_page_connection);
-				if (subs)
+				if (m_timeshift_changed)
 				{
-					int type = PyInt_AsLong(PyTuple_GET_ITEM(subs, 0)),
-					    pid = PyInt_AsLong(PyTuple_GET_ITEM(subs, 1)),
-					    comp_page = PyInt_AsLong(PyTuple_GET_ITEM(subs, 2)), // ttx page
-					    anc_page = PyInt_AsLong(PyTuple_GET_ITEM(subs, 3)); // ttx magazine
-					if (type == 0) // dvb
-						m_subtitle_parser->start(pid, comp_page, anc_page);
-					else if (type == 1) // ttx
-						m_teletext_parser->setPageAndMagazine(comp_page, anc_page);
+					ePyObject subs = getCachedSubtitle();
+					if (subs != Py_None)
+					{
+						int type = PyInt_AsLong(PyTuple_GET_ITEM(subs, 0)),
+						    pid = PyInt_AsLong(PyTuple_GET_ITEM(subs, 1)),
+						    comp_page = PyInt_AsLong(PyTuple_GET_ITEM(subs, 2)), // ttx page
+						    anc_page = PyInt_AsLong(PyTuple_GET_ITEM(subs, 3)); // ttx magazine
+						if (type == 0) // dvb
+							m_subtitle_parser->start(pid, comp_page, anc_page);
+						else if (type == 1) // ttx
+							m_teletext_parser->setPageAndMagazine(comp_page, anc_page);
+					}
 					Py_DECREF(subs);
 				}
 			}