mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-09-03 02:41:21 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into pu/mp

Browse Source
This commit is contained in:
Jacek Jendrzej
2017-10-02 13:56:25 +02:00
parent 08dc0d7561 2f39081708
commit 7ad4a0e6cc
38 changed files with 68 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/gui/osd_setup.cpp
View File

@@ -1323,7 +1323,7 @@ void COsdSetup::showOsdVolumeSetup(CMenuWidget *menu_volume)
// volume size
int vMin = CVolumeHelper::getInstance()->getVolIconHeight();
g_settings.volume_size = max(g_settings.volume_size, vMin);
g_settings.volume_size = std::max(g_settings.volume_size, vMin);
CMenuOptionNumberChooser * nc = new CMenuOptionNumberChooser(LOCALE_EXTRA_VOLUME_SIZE, &g_settings.volume_size, true, vMin, 50);
nc->setHint("", LOCALE_MENU_HINT_VOLUME_SIZE);
menu_volume->addItem(nc);