From: ghost <andreas.monzner@multimedia-labs.de>
Date: Mon, 21 Dec 2009 19:32:41 +0000 (+0100)
Subject: servicedvb.cpp: small cleanup
X-Git-Tag: 3.0.0~28^2~66^2~137
X-Git-Url: https://git.cweiske.de/enigma2.git/commitdiff_plain/37b6491b12090e02c5a7ad9ea2d161c528c8788b

servicedvb.cpp: small cleanup
---

diff --git a/lib/service/servicedvb.cpp b/lib/service/servicedvb.cpp
index 77e2bd4e..e6af1e66 100644
--- a/lib/service/servicedvb.cpp
+++ b/lib/service/servicedvb.cpp
@@ -2300,6 +2300,7 @@ void eDVBServicePlay::switchToTimeshift()
 void eDVBServicePlay::updateDecoder()
 {
 	int vpid = -1, vpidtype = -1, pcrpid = -1, tpid = -1, achannel = -1, ac3_delay=-1, pcm_delay=-1;
+	bool mustPlay = false;
 
 	eDVBServicePMTHandler &h = m_timeshift_active ? m_service_handler_timeshift : m_service_handler;
 
@@ -2380,11 +2381,10 @@ void eDVBServicePlay::updateDecoder()
 					Py_DECREF(subs);
 				}
 			}
-			m_decoder->play(); /* pids will be set later */
 		}
 		if (m_cue)
 			m_cue->setDecodingDemux(m_decode_demux, m_decoder);
-		m_decoder->play(); /* pids will be set later. */
+		mustPlay = true;
 	}
 
 	m_timeshift_changed = 0;
@@ -2449,7 +2449,11 @@ void eDVBServicePlay::updateDecoder()
 				m_decoder->setRadioPic(radio_pic);
 		}
 
-		m_decoder->set();
+		if (mustPlay)
+			m_decoder->play();
+		else
+			m_decoder->set();
+
 		m_decoder->setAudioChannel(achannel);
 
 		/* don't worry about non-existing services, nor pvr services */