From a55c6455b9a3f2498b81543b4a3baffac6f00d05 Mon Sep 17 00:00:00 2001 From: "[CST] Focus" Date: Thu, 27 Jun 2013 17:58:49 +0400 Subject: [PATCH] src/gui/scan_setup.cpp: prevent crash in wizard - channel list not created yet Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/584405883da47f7a46f2c85f6e7c7cb977ebdc65 Author: [CST] Focus Date: 2013-06-27 (Thu, 27 Jun 2013) ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- src/gui/scan_setup.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/gui/scan_setup.cpp b/src/gui/scan_setup.cpp index 6fbd35a3f..2180b252b 100644 --- a/src/gui/scan_setup.cpp +++ b/src/gui/scan_setup.cpp @@ -660,7 +660,7 @@ int CScanSetup::showScanMenuFrontendSetup() fe_restart = false; CFEManager::getInstance()->linkFrontends(true); t_channel_id live_channel_id = CZapit::getInstance()->GetCurrentChannelID(); - if (live_channel_id) + if (live_channel_id && CNeutrinoApp::getInstance()->channelList) CNeutrinoApp::getInstance()->channelList->zapTo_ChannelID(live_channel_id, true); } return res;