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

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

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: b6d2bad857
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2016-01-21 (Thu, 21 Jan 2016)


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

------------------
This commit was generated by Migit
This commit is contained in:
Michael Liebmann
2016-01-21 17:57:38 +01:00
parent 54c0ce715a b0ca9a30cd
commit 6b1841a1b0
43 changed files with 485 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/neutrino.cpp
View File

@@ -2193,6 +2193,7 @@ void CNeutrinoApp::quickZap(int msg)
void CNeutrinoApp::numericZap(int msg)
{
StopSubtitles();
g_InfoViewer->setSwitchMode(CInfoViewer::IV_MODE_NUMBER_ZAP);
int res = channelList->numericZap( msg );
StartSubtitles(res < 0);
if (res >= 0 && CRCInput::isNumeric(msg)) {
@@ -2835,7 +2836,7 @@ int CNeutrinoApp::handleMsg(const neutrino_msg_t _msg, neutrino_msg_data_t data)
}
/* ================================== KEYS ================================================ */
if( msg == CRCInput::RC_ok || (!g_InfoViewer->virtual_zap_mode && (msg == CRCInput::RC_sat || msg == CRCInput::RC_favorites))) {
if( msg == CRCInput::RC_ok || (!g_InfoViewer->getSwitchMode() && (msg == CRCInput::RC_sat || msg == CRCInput::RC_favorites))) {
if( (mode == mode_tv) || (mode == mode_radio) || (mode == mode_ts) || (mode == mode_webtv)) {
showChannelList(msg);
return messages_return::handled;