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

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

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: 22dd798325
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-02-25 (Wed, 25 Feb 2015)


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

------------------
This commit was generated by Migit
This commit is contained in:
Stefan Seyfried
2015-02-25 21:20:22 +01:00
parent 3ce8390843 f62fbd7b50
commit f5d3bb2d9f
8 changed files with 41 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/gui/user_menue.cpp
View File

@@ -101,6 +101,7 @@ CUserMenu::~CUserMenu()
bool CUserMenu::showUserMenu(neutrino_msg_t msg)
{
int button = -1;
int dummy = 0;
unsigned ums = g_settings.usermenu.size();
for (unsigned int i = 0; i < ums; i++)
if (g_settings.usermenu[i]->key == msg) {
@@ -236,7 +237,7 @@ bool CUserMenu::showUserMenu(neutrino_msg_t msg)
break;
case SNeutrinoSettings::ITEM_EPG_MISC:
{
int dummy = g_Sectionsd->getIsScanningActive();
dummy = g_Sectionsd->getIsScanningActive();
keyhelper.get(&key,&icon);
// new CMenuOptionChooser(LOCALE_VIDEOMENU_VIDEOMODE, &g_settings.video_Mode, VIDEOMENU_VIDEOMODE_OPTIONS, VIDEOMENU_VIDEOMODE_OPTION_COUNT, true, this, CRCInput::RC_nokey, "", true);
menu_item = new CMenuOptionChooser(LOCALE_MAINMENU_PAUSESECTIONSD, &dummy, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true, this , key, icon );