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

Merge remote-tracking branch 'n/cst-next-fixed'

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: f5c72d35c8
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2016-01-24 (Sun, 24 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-24 13:15:43 +01:00
parent 0e475c8ddf 23ceb1bbd6
commit 50cb7dd5d3
58 changed files with 627 additions and 171 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/gui/user_menue.cpp
View File

@@ -225,7 +225,7 @@ bool CUserMenu::showUserMenu(neutrino_msg_t msg)
break;
case SNeutrinoSettings::ITEM_REMOTE:
keyhelper.get(&key,&icon,feat_key[g_settings.personalize[SNeutrinoSettings::P_FEAT_KEY_RC_LOCK]].key); //CRCInput::RC_nokey);
menu_item = new CMenuDForwarder(LOCALE_RCLOCK_MENUEADD, true, NULL, new CRCLock, "-1" , key, icon );
menu_item = new CMenuForwarder(LOCALE_RCLOCK_TITLE, true, NULL, CRCLock::getInstance(), "-1" , key, icon );
// FIXME menu_item->setHint("", NONEXISTANT_LOCALE);
break;
case SNeutrinoSettings::ITEM_EPG_SUPER: