mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-28 07:51:19 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into pu/mp

Browse Source 
Conflicts:
	src/gui/miscsettings_menu.cpp
	src/neutrino.cpp
	src/system/settings.h
This commit is contained in:
svenhoefer
2017-03-20 01:31:51 +01:00
parent 66ea57d710 b8a97a97ca
commit b12624d1fa
12 changed files with 174 additions and 141 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/gui/miscsettings_menu.cpp
View File

@@ -333,7 +333,7 @@ void CMiscMenue::showMiscSettingsMenuGeneral(CMenuWidget *ms_general)
ms_general->addItem(mc);
//fan speed
if (g_info.has_fan)
if (g_info.hw_caps->has_fan)
{
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);