From f9d64f5a4a5f74b5f0b5eaef7495d21813855df2 Mon Sep 17 00:00:00 2001 From: Stefan Seyfried Date: Sun, 24 Feb 2013 17:45:51 +0100 Subject: [PATCH] zapit: fix order of stopping playback and selecting live FE Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/4f3561104e5ab647fd86034cb66e8feb1e041d5b Author: Stefan Seyfried Date: 2013-02-24 (Sun, 24 Feb 2013) ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- src/zapit/src/zapit.cpp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/zapit/src/zapit.cpp b/src/zapit/src/zapit.cpp index 64cd74c13..8158dc9bf 100644 --- a/src/zapit/src/zapit.cpp +++ b/src/zapit/src/zapit.cpp @@ -479,9 +479,6 @@ bool CZapit::ZapIt(const t_channel_id channel_id, bool forupdate, bool startplay ERROR("Cannot get frontend\n"); return false; } - live_fe = fe; - CFEManager::getInstance()->setLiveFE(live_fe); - sig_delay = 2; if (!firstzap && current_channel) SaveChannelPids(current_channel); @@ -491,8 +488,13 @@ bool CZapit::ZapIt(const t_channel_id channel_id, bool forupdate, bool startplay pmt_stop_update_filter(&pmt_update_fd); + /* stop playback on the old frontend... */ StopPlayBack(!forupdate); + /* then select the new one... */ + live_fe = fe; + CFEManager::getInstance()->setLiveFE(live_fe); + if(!forupdate && current_channel) current_channel->resetPids();