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 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox

Browse Source 
Conflicts:
	src/system/helpers.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 14473245e8
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-22 (Wed, 22 Feb 2017)



------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2017-02-22 08:29:51 +01:00
parent 8154702d1d abe232fc6c
commit 47dcb723f0
11 changed files with 308 additions and 134 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/gui/cam_menu.cpp
View File

@@ -538,7 +538,7 @@ int CCAMMenuHandler::doMenu(int slot, CA_SLOT_TYPE slotType)
g_Locale->getText(slotType == CA_SLOT_TYPE_CI ? LOCALE_CI_WAITING : LOCALE_SC_WAITING));
g_RCInput->getMsgAbsoluteTimeout (&msg, &data, &timeoutEnd);
printf("CCAMMenuHandler::doMenu: msg %x data %x\n", msg, data);
printf("CCAMMenuHandler::doMenu: msg %lx data %lx\n", msg, data);
if (msg == CRCInput::RC_timeout) {
printf("CCAMMenuHandler::doMenu: menu timeout\n");
hideHintBox();