From 68287b17d15d1a16365bbe3d58715231f39c040a Mon Sep 17 00:00:00 2001 From: Thilo Graf Date: Thu, 14 Jan 2016 21:58:15 +0100 Subject: [PATCH] COsdSetup: fix possible crash on font setup in wizard mode Channellist is not initialized in wizard mode. Origin commit data ------------------ Commit: https://github.com/neutrino-images/ni-neutrino/commit/53bab09bdad2762710e582877371b89770ba3b6e Author: Thilo Graf Date: 2016-01-14 (Thu, 14 Jan 2016) --- src/gui/osd_setup.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/gui/osd_setup.cpp b/src/gui/osd_setup.cpp index f052b5b83..95a9ddb94 100644 --- a/src/gui/osd_setup.cpp +++ b/src/gui/osd_setup.cpp @@ -253,7 +253,8 @@ int COsdSetup::exec(CMenuTarget* parent, const std::string &actionKey) if (xre != g_settings.screen_xres || yre != g_settings.screen_yres) { printf("[neutrino] new font scale settings x: %d%% y: %d%%\n", g_settings.screen_xres, g_settings.screen_yres); CNeutrinoApp::getInstance()->SetupFonts(CNeutrinoFonts::FONTSETUP_NEUTRINO_FONT | CNeutrinoFonts::FONTSETUP_NEUTRINO_FONT_INST | CNeutrinoFonts::FONTSETUP_DYN_FONT); - CNeutrinoApp::getInstance()->channelList->ResetModules(); //force re init of all modules + if (CNeutrinoApp::getInstance()->channelList) + CNeutrinoApp::getInstance()->channelList->ResetModules(); //force re init of all modules } return res; }