mirror of
https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git
synced 2025-08-29 08:21:07 +02:00
miscsettings: prevent segfault on hardware that can't shutdown
Origin commit data
------------------
Branch: ni/coolstream
Commit: d30b97afa9
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2012-10-16 (Tue, 16 Oct 2012)
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
This commit is contained in:
@@ -157,6 +157,7 @@ const CMenuOptionChooser::keyval_ext CPU_FREQ_OPTIONS[CPU_FREQ_OPTION_COUNT] =
|
|||||||
int CMiscMenue::showMiscSettingsMenu()
|
int CMiscMenue::showMiscSettingsMenu()
|
||||||
{
|
{
|
||||||
//misc settings
|
//misc settings
|
||||||
|
miscNotifier = NULL; /* for check at exit */
|
||||||
fanNotifier = new CFanControlNotifier();
|
fanNotifier = new CFanControlNotifier();
|
||||||
sectionsdConfigNotifier = new CSectionsdConfigNotifier();
|
sectionsdConfigNotifier = new CSectionsdConfigNotifier();
|
||||||
CMenuWidget misc_menue(LOCALE_MAINSETTINGS_HEAD, NEUTRINO_ICON_SETTINGS, width, MN_WIDGET_ID_MISCSETUP);
|
CMenuWidget misc_menue(LOCALE_MAINSETTINGS_HEAD, NEUTRINO_ICON_SETTINGS, width, MN_WIDGET_ID_MISCSETUP);
|
||||||
@@ -232,7 +233,8 @@ int CMiscMenue::showMiscSettingsMenu()
|
|||||||
int res = misc_menue.exec(NULL, "");
|
int res = misc_menue.exec(NULL, "");
|
||||||
delete fanNotifier;
|
delete fanNotifier;
|
||||||
delete sectionsdConfigNotifier;
|
delete sectionsdConfigNotifier;
|
||||||
delete miscNotifier;
|
if (miscNotifier)
|
||||||
|
delete miscNotifier;
|
||||||
return res;
|
return res;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user