mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-08-30 00:41:09 +02:00
Code Issues Packages Projects Releases Wiki Activity

osd_setup.cpp: Fix segfault in mode single tuner/display tuner icon

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: 7a414b7c56
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2012-10-02 (Tue, 02 Oct 2012)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
This commit is contained in:
Michael Liebmann
2012-10-02 11:58:12 +02:00
parent b927dd99d0
commit b7dbab80c0
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/gui/osd_setup.cpp
View File

@@ -73,6 +73,7 @@ COsdSetup::COsdSetup(bool wizard_mode)
is_wizard = wizard_mode; is_wizard = wizard_mode;
width = w_max (40, 10); //% width = w_max (40, 10); //%
show_tuner_icon = 0;
} }
COsdSetup::~COsdSetup() COsdSetup::~COsdSetup()
@@ -763,7 +764,7 @@ void COsdSetup::showOsdInfobarSetup(CMenuWidget *menu_infobar)
// tuner icon // tuner icon
bool mc_active = false; 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 // show possible option if we in single box mode, but don't touch the real settings
int *p_show_tuner_icon = &show_tuner_icon; int *p_show_tuner_icon = &show_tuner_icon;
if (CFEManager::getInstance()->getMode() != CFEManager::FE_MODE_SINGLE){ if (CFEManager::getInstance()->getMode() != CFEManager::FE_MODE_SINGLE){

1
src/gui/osd_setup.h
View File

@@ -49,6 +49,7 @@ class COsdSetup : public CMenuTarget, public CChangeObserver
int width; int width;
bool is_wizard; bool is_wizard;
int show_tuner_icon;
int showOsdSetup(); int showOsdSetup();
void showOsdMenueColorSetup(CMenuWidget *menu_colors); void showOsdMenueColorSetup(CMenuWidget *menu_colors);