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

Merge remote-tracking branch 'uncool/cst-next'

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: 9113716171
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2016-01-01 (Fri, 01 Jan 2016)


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

------------------
This commit was generated by Migit
This commit is contained in:
Stefan Seyfried
2016-01-01 14:10:48 +01:00
parent f290fecebd 710892b516
commit a28613ab99
36 changed files with 249 additions and 144 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/gui/user_menue.cpp
View File

@@ -479,13 +479,12 @@ bool CUserMenu::showUserMenu(neutrino_msg_t msg)
return true;
}
const char *CUserMenu::getUserMenuButtonName(int button, bool &active)
const char *CUserMenu::getUserMenuButtonName(int button, bool &active, bool return_title)
{
active = false;
if(button < 0 || button >= (int) g_settings.usermenu.size())
return "";
bool return_title = false;
neutrino_locale_t loc = NONEXISTANT_LOCALE;
const char *text = NULL;