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

Merge branch 'check/next-cc'

Browse Source 
Only compile-tested.


Origin commit data
------------------
Branch: ni/coolstream
Commit: b5e736e81b
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-11-30 (Sat, 30 Nov 2013)



------------------
This commit was generated by Migit
This commit is contained in:
Stefan Seyfried
2013-11-30 20:17:31 +01:00
parent f153dcbd1e 2b6a033d8e
commit ea50f5f7bc
83 changed files with 913 additions and 652 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/gui/cam_menu.cpp
View File

@@ -135,7 +135,7 @@ int CCAMMenuHandler::doMainMenu()
} else {
snprintf(str1, sizeof(str1), "%s %d", g_Locale->getText(LOCALE_CI_EMPTY), i);
tempMenu = new CMenuWidget(str1, NEUTRINO_ICON_SETTINGS);
cammenu->addItem(new CMenuForwarderNonLocalized(str1, false, NULL, tempMenu));
cammenu->addItem(new CMenuDForwarderNonLocalized(str1, false, NULL, tempMenu));
memset(str1,0,sizeof(str1));
}
if (i < (CiSlots - 1))
@@ -166,7 +166,7 @@ int CCAMMenuHandler::doMainMenu()
} else {
snprintf(str1, sizeof(str1), "%s %d", g_Locale->getText(LOCALE_SC_EMPTY), i);
tempMenu = new CMenuWidget(str1, NEUTRINO_ICON_SETTINGS);
cammenu->addItem(new CMenuForwarderNonLocalized(str1, false, NULL, tempMenu));
cammenu->addItem(new CMenuDForwarderNonLocalized(str1, false, NULL, tempMenu));
memset(str1,0,sizeof(str1));
}
if (i < (ScNum - 1))