From 663bb0c48cf2015c7d6bfb011e25c5a946b46b14 Mon Sep 17 00:00:00 2001
From: "[CST] Focus" <focus.cst@gmail.com>
Date: Fri, 28 Mar 2014 14:15:06 +0400
Subject: [PATCH] zapit/src/zapit.cpp: remove PIP_DEMUX usage

Origin commit data
------------------
Branch: ni/coolstream
Commit: https://github.com/neutrino-images/ni-neutrino/commit/c4dc1439349c31d4b4ee8478002aa7185ae71640
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-03-28 (Fri, 28 Mar 2014)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
---
 src/zapit/src/zapit.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/zapit/src/zapit.cpp b/src/zapit/src/zapit.cpp
index 110a6e700..548a58855 100644
--- a/src/zapit/src/zapit.cpp
+++ b/src/zapit/src/zapit.cpp
@@ -645,6 +645,9 @@ bool CZapit::StartPip(const t_channel_id channel_id)
 	if (pipDemux && (pipDemux->getUnit() != dnum)) {
 		pipDecoder->SetDemux(NULL);
 		delete pipDemux;
+		pipDemux = NULL;
+	}
+	if (!pipDemux) {
 		pipDemux = new cDemux(dnum);
 		pipDemux->Open(DMX_PIP_CHANNEL);
 		pipDecoder->SetDemux(pipDemux);
@@ -2264,8 +2267,6 @@ bool CZapit::Start(Z_start_arg *ZapStart_arg)
 #ifdef ENABLE_PIP
 	/* FIXME until proper demux management */
 	int dnum = 1;
-	if (CFEManager::getInstance()->getFrontendCount() < MAX_DMX_UNITS)
-		dnum = PIP_DEMUX;
 #endif
 #ifdef BOXMODEL_APOLLO
 	videoDecoder = cVideo::GetDecoder(0);