zapit: fix order of stopping playback and selecting live FE

This commit is contained in:
Stefan Seyfried
2013-02-24 17:45:51 +01:00
parent cdd60c3600
commit f45a04b34a

View File

@@ -488,9 +488,6 @@ bool CZapit::ZapIt(const t_channel_id channel_id, bool forupdate, bool startplay
ERROR("Cannot get frontend\n"); ERROR("Cannot get frontend\n");
return false; return false;
} }
live_fe = fe;
CFEManager::getInstance()->setLiveFE(live_fe);
sig_delay = 2; sig_delay = 2;
if (!firstzap && current_channel) if (!firstzap && current_channel)
SaveChannelPids(current_channel); SaveChannelPids(current_channel);
@@ -500,8 +497,13 @@ bool CZapit::ZapIt(const t_channel_id channel_id, bool forupdate, bool startplay
pmt_stop_update_filter(&pmt_update_fd); pmt_stop_update_filter(&pmt_update_fd);
/* stop playback on the old frontend... */
StopPlayBack(!forupdate); StopPlayBack(!forupdate);
/* then select the new one... */
live_fe = fe;
CFEManager::getInstance()->setLiveFE(live_fe);
if(!forupdate && current_channel) if(!forupdate && current_channel)
current_channel->resetPids(); current_channel->resetPids();