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

neutrino: don't crash during fanspeed setup

Browse Source 
Dear pupils, this is what we learned in todays:
* crashing == bad
* not crashing == good
* deleting an object and then using it == crash

git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@1218 e54a6e83-5905-42d5-8d5c-058d10e6a962


Origin commit data
------------------
Branch: ni/coolstream
Commit: 931c2c2661
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2011-02-26 (Sat, 26 Feb 2011)



------------------
This commit was generated by Migit
This commit is contained in:
Stefan Seyfried
2011-02-26 16:22:24 +00:00
parent 41f783201c
commit ad0c9f35eb
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/gui/miscsettings_menu.cpp
View File

@@ -55,6 +55,9 @@
extern CPlugins * g_PluginList; extern CPlugins * g_PluginList;
/* this is ugly, but at least it does not crash */
CFanControlNotifier *fanNotifier;
CMiscMenue::CMiscMenue() CMiscMenue::CMiscMenue()
{ {
width = w_max (40, 10); width = w_max (40, 10);
@@ -170,6 +173,7 @@ const CMenuOptionChooser::keyval_ext CPU_FREQ_OPTIONS[CPU_FREQ_OPTION_COUNT] =
void CMiscMenue::showMiscSettingsMenu() void CMiscMenue::showMiscSettingsMenu()
{ {
//misc settings //misc settings
fanNotifier = new CFanControlNotifier();
CMenuWidget *misc_menue = new CMenuWidget(LOCALE_MAINSETTINGS_HEAD, NEUTRINO_ICON_SETTINGS, width); CMenuWidget *misc_menue = new CMenuWidget(LOCALE_MAINSETTINGS_HEAD, NEUTRINO_ICON_SETTINGS, width);
misc_menue->setSelected(selected); misc_menue->setSelected(selected);
@@ -221,6 +225,7 @@ void CMiscMenue::showMiscSettingsMenu()
misc_menue->exec(NULL, ""); misc_menue->exec(NULL, "");
misc_menue->hide(); misc_menue->hide();
selected = misc_menue->getSelected(); selected = misc_menue->getSelected();
delete fanNotifier;
delete misc_menue; delete misc_menue;
} }
@@ -236,11 +241,8 @@ void CMiscMenue::showMiscSettingsMenuGeneral(CMenuWidget *ms_general)
//fan speed //fan speed
if (g_info.has_fan) if (g_info.has_fan)
{ {
CFanControlNotifier *fanNotifier = new CFanControlNotifier();
//don't show fan speed settings on cable box and NEO
ms_general->addItem(new CMenuOptionNumberChooser(LOCALE_FAN_SPEED, &g_settings.fan_speed, true, 1, 14, fanNotifier, 0, 0, LOCALE_OPTIONS_OFF) ); ms_general->addItem(new CMenuOptionNumberChooser(LOCALE_FAN_SPEED, &g_settings.fan_speed, true, 1, 14, fanNotifier, 0, 0, LOCALE_OPTIONS_OFF) );
fanNotifier->changeNotify(NONEXISTANT_LOCALE, (void*) &g_settings.fan_speed); fanNotifier->changeNotify(NONEXISTANT_LOCALE, (void*) &g_settings.fan_speed);
delete fanNotifier;
} }
//rotor //rotor