From f45a04b34a2beec2feddd8e4a36310b1fca8cd7c Mon Sep 17 00:00:00 2001
From: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: Sun, 24 Feb 2013 17:45:51 +0100
Subject: [PATCH] zapit: fix order of stopping playback and selecting live FE

---
 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 d89112ba0..32719f60a 100644
--- a/src/zapit/src/zapit.cpp
+++ b/src/zapit/src/zapit.cpp
@@ -488,9 +488,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);
@@ -500,8 +497,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();