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

Merge branch 'cst-next' into nmp-cst-next

Browse Source 
- Fix merge conflicts


Origin commit data
------------------
Branch: ni/coolstream
Commit: 7a3c90fccf
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2016-08-19 (Fri, 19 Aug 2016)



------------------
This commit was generated by Migit
This commit is contained in:
Michael Liebmann
2016-08-19 17:40:48 +02:00
parent 3daad4c6d5 59d3c49084
commit 2c4ccf9555
260 changed files with 8682 additions and 4001 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/gui/cam_menu.cpp
View File

@@ -104,7 +104,7 @@ int CCAMMenuHandler::doMainMenu()
char name1[255]={0};
char str1[255]={0};
int CiSlots = ca->GetNumberCISlots();
int CiSlots = ca ? ca->GetNumberCISlots() : 0;
CMenuWidget* cammenu = new CMenuWidget(LOCALE_CI_SETTINGS, NEUTRINO_ICON_SETTINGS);
cammenu->addIntroItems();
@@ -171,7 +171,7 @@ int CCAMMenuHandler::doMainMenu()
}
i = 0;
int ScNum = ca->GetNumberSmartCardSlots();
int ScNum = ca ? ca->GetNumberSmartCardSlots() : 0;
printf("CCAMMenuHandler::doMainMenu sc slots: %d\n", ScNum);
if(ScNum && CiSlots)