From b7dbab80c0db6f135eee0fee482a312148ab8fc3 Mon Sep 17 00:00:00 2001 From: Michael Liebmann Date: Tue, 2 Oct 2012 11:58:12 +0200 Subject: [PATCH] osd_setup.cpp: Fix segfault in mode single tuner/display tuner icon Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/7a414b7c56636f8bf50e06957bcf54ffc226ce13 Author: Michael Liebmann Date: 2012-10-02 (Tue, 02 Oct 2012) ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- src/gui/osd_setup.cpp | 3 ++- src/gui/osd_setup.h | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/gui/osd_setup.cpp b/src/gui/osd_setup.cpp index 610642622..82a6df825 100644 --- a/src/gui/osd_setup.cpp +++ b/src/gui/osd_setup.cpp @@ -73,6 +73,7 @@ COsdSetup::COsdSetup(bool wizard_mode) is_wizard = wizard_mode; width = w_max (40, 10); //% + show_tuner_icon = 0; } COsdSetup::~COsdSetup() @@ -763,7 +764,7 @@ void COsdSetup::showOsdInfobarSetup(CMenuWidget *menu_infobar) // tuner icon bool mc_active = false; - int show_tuner_icon = 0; + show_tuner_icon = 0; // show possible option if we in single box mode, but don't touch the real settings int *p_show_tuner_icon = &show_tuner_icon; if (CFEManager::getInstance()->getMode() != CFEManager::FE_MODE_SINGLE){ diff --git a/src/gui/osd_setup.h b/src/gui/osd_setup.h index 65429d9dc..99db7df0f 100644 --- a/src/gui/osd_setup.h +++ b/src/gui/osd_setup.h @@ -49,6 +49,7 @@ class COsdSetup : public CMenuTarget, public CChangeObserver int width; bool is_wizard; + int show_tuner_icon; int showOsdSetup(); void showOsdMenueColorSetup(CMenuWidget *menu_colors);