From: Felix Domke <tmbinc@elitedvb.net>
Date: Fri, 13 Jul 2007 13:31:19 +0000 (+0000)
Subject: don't crash when no decode_demux present
X-Git-Tag: 2.6.0~2100
X-Git-Url: https://git.cweiske.de/enigma2.git/commitdiff_plain/721b76b816200cd68a187a839062e50b0eca1303

don't crash when no decode_demux present
---

diff --git a/lib/service/servicedvb.cpp b/lib/service/servicedvb.cpp
index 613dc9be..7f931334 100644
--- a/lib/service/servicedvb.cpp
+++ b/lib/service/servicedvb.cpp
@@ -2277,13 +2277,18 @@ void eDVBServicePlay::updateDecoder()
 			m_decode_demux->getMPEGDecoder(m_decoder, m_is_primary);
 			if (m_decoder)
 				m_decoder->connectVideoEvent(slot(*this, &eDVBServicePlay::video_event), m_video_event_connection);
+			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);
+		} else
+		{
+			m_teletext_parser = 0;
+			m_subtitle_parser = 0;
 		}
+
 		if (m_cue)
 			m_cue->setDecodingDemux(m_decode_demux, m_decoder);
-		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 (m_decoder)
@@ -2367,7 +2372,7 @@ void eDVBServicePlay::updateDecoder()
 // how we can do this better?
 // update cache pid when the user changed the audio track or video track
 // TODO handling of difference audio types.. default audio types..
-				
+
 		/* don't worry about non-existing services, nor pvr services */
 		if (m_dvb_service && !m_is_pvr)
 		{