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

miscsettings_menu: fix - miscsettings.cpp: fix some memleaks and CPU-Menu segfault

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: 1192567fc6
Author: Thilo Graf <dbt@novatux.de>
Date: 2021-03-31 (Wed, 31 Mar 2021)


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

------------------
This commit was generated by Migit
This commit is contained in:
Thilo Graf
2021-03-31 22:15:28 +02:00
committed by vanhofen
parent 14fa711bd1
commit 506f54b7f4
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/gui/miscsettings_menu.cpp
View File

@@ -340,7 +340,7 @@ int CMiscMenue::showMiscSettingsMenu()
CMenuWidget misc_menue_cpu(LOCALE_MAINSETTINGS_HEAD, NEUTRINO_ICON_SETTINGS, width); CMenuWidget misc_menue_cpu(LOCALE_MAINSETTINGS_HEAD, NEUTRINO_ICON_SETTINGS, width);
if (g_info.hw_caps->can_cpufreq) if (g_info.hw_caps->can_cpufreq)
{ {
if (cpuNotifier != NULL) if (cpuNotifier == NULL)
cpuNotifier = new CCpuFreqNotifier(); cpuNotifier = new CCpuFreqNotifier();
showMiscSettingsMenuCPUFreq(&misc_menue_cpu); showMiscSettingsMenuCPUFreq(&misc_menue_cpu);
mf = new CMenuForwarder(LOCALE_MISCSETTINGS_CPU, true, NULL, &misc_menue_cpu, NULL, CRCInput::convertDigitToKey(shortcut++)); mf = new CMenuForwarder(LOCALE_MISCSETTINGS_CPU, true, NULL, &misc_menue_cpu, NULL, CRCInput::convertDigitToKey(shortcut++));
@@ -391,7 +391,7 @@ void CMiscMenue::showMiscSettingsMenuGeneral(CMenuWidget *ms_general)
//fan speed //fan speed
if (g_info.hw_caps->has_fan) if (g_info.hw_caps->has_fan)
{ {
if (fanNotifier != NULL) if (fanNotifier == NULL)
fanNotifier = new CFanControlNotifier(); fanNotifier = new CFanControlNotifier();
CMenuOptionNumberChooser * mn = new CMenuOptionNumberChooser(LOCALE_FAN_SPEED, &g_settings.fan_speed, true, 1, 14, fanNotifier, CRCInput::RC_nokey, NULL, 0, 0, LOCALE_OPTIONS_OFF); CMenuOptionNumberChooser * mn = new CMenuOptionNumberChooser(LOCALE_FAN_SPEED, &g_settings.fan_speed, true, 1, 14, fanNotifier, CRCInput::RC_nokey, NULL, 0, 0, LOCALE_OPTIONS_OFF);
mn->setHint("", LOCALE_MENU_HINT_FAN_SPEED); mn->setHint("", LOCALE_MENU_HINT_FAN_SPEED);