From d0f58e06ad1cdfb6d6d16511f6f5791463a4b49b Mon Sep 17 00:00:00 2001 From: "[CST] Focus" Date: Mon, 25 Mar 2013 13:36:00 +0400 Subject: [PATCH] neutrino.cpp: stop stream before pip start Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/305455e0048d4979234f8ae5ccefbc84f653bf77 Author: [CST] Focus Date: 2013-03-25 (Mon, 25 Mar 2013) ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- src/neutrino.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/neutrino.cpp b/src/neutrino.cpp index e3b486e54..93b5e253a 100644 --- a/src/neutrino.cpp +++ b/src/neutrino.cpp @@ -3878,8 +3878,11 @@ bool CNeutrinoApp::StartPip(const t_channel_id channel_id) if (!channel) return ret; + if (channel->getRecordDemux() == channel->getPipDemux()) + CStreamManager::getInstance()->StopStream(channel_id); + int recmode = CRecordManager::getInstance()->GetRecordMode(channel_id); - if ((channel->getRecordDemux() != channel->getPipDemux()) || (recmode == CRecordManager::RECMODE_OFF)) { + if ((recmode == CRecordManager::RECMODE_OFF) || (channel->getRecordDemux() != channel->getPipDemux())) { if (!g_Zapit->zapTo_pip(channel_id)) DisplayErrorMessage(g_Locale->getText(LOCALE_VIDEOMENU_PIP_ERROR)); else