From d39fc2abaeb4b641d18d527fe2b3b77a618b9564 Mon Sep 17 00:00:00 2001 From: "[CST] Focus" Date: Tue, 19 Mar 2013 13:56:13 +0400 Subject: [PATCH] gui/scan.cpp: fix 9b1e987d037418e9b46d5ad8b152470bc9296be4, inside start wizard zap crash, because neutrino channel list not created yet Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/8f500e80fd923796b5caa28a74b3a78ff66f108f Author: [CST] Focus Date: 2013-03-19 (Tue, 19 Mar 2013) ------------------ This commit was generated by Migit --- src/gui/scan.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/gui/scan.cpp b/src/gui/scan.cpp index 436aaaac0..ca82c0a51 100644 --- a/src/gui/scan.cpp +++ b/src/gui/scan.cpp @@ -345,7 +345,8 @@ int CScanTs::exec(CMenuTarget* /*parent*/, const std::string & actionKey) videoDecoder->StopPicture(); frameBuffer->Clear(); g_Sectionsd->setPauseScanning(false); - CNeutrinoApp::getInstance()->channelList->zapTo_ChannelID(CZapit::getInstance()->GetCurrentChannelID(), true); /* force re-zap */ + if (CNeutrinoApp::getInstance()->channelList) + CNeutrinoApp::getInstance()->channelList->zapTo_ChannelID(CZapit::getInstance()->GetCurrentChannelID(), true); /* force re-zap */ CVFD::getInstance()->setMode(CVFD::MODE_TVRADIO); return menu_return::RETURN_REPAINT;