From f567d3b85d317c5118515ac86273f8b06e9a6572 Mon Sep 17 00:00:00 2001
From: "[CST] Focus" <focus.cst@gmail.com>
Date: Thu, 28 Feb 2013 15:53:07 +0400
Subject: [PATCH] gui/scan.cpp: add zap to current channel_id after scan

---
 src/gui/scan.cpp | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/gui/scan.cpp b/src/gui/scan.cpp
index d30030f63..3303e134e 100644
--- a/src/gui/scan.cpp
+++ b/src/gui/scan.cpp
@@ -200,6 +200,9 @@ int CScanTs::exec(CMenuTarget* /*parent*/, const std::string & actionKey)
 
 	CRecordManager::getInstance()->StopAutoRecord();
 	g_Zapit->stopPlayBack();
+#ifdef BOXMODEL_APOLLO
+	CZapit::getInstance()->StopPip();
+#endif
 
 	frameBuffer->paintBackground();
 	videoDecoder->ShowPicture(DATADIR "/neutrino/icons/scan.jpg");
@@ -342,6 +345,8 @@ int CScanTs::exec(CMenuTarget* /*parent*/, const std::string & actionKey)
 	videoDecoder->StopPicture();
 	frameBuffer->Clear();
 	g_Sectionsd->setPauseScanning(false);
+	CNeutrinoApp::getInstance()->channelList->setSelected(0xfffffff);
+	CNeutrinoApp::getInstance()->channelList->zapTo_ChannelID(CZapit::getInstance()->GetCurrentChannelID());
 	CVFD::getInstance()->setMode(CVFD::MODE_TVRADIO);
 
 	return menu_return::RETURN_REPAINT;