mirror of
https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git
synced 2025-08-27 15:32:52 +02:00
Merge branch 'dvbsi++' of coolstreamtech.de:cst-private-neutrino into neutrino-apollo
Conflicts:
src/nhttpd/yhttpd.cpp
Origin commit data
------------------
Branch: ni/coolstream
Commit: 9448cd8d2a
Author: [CST] Bas <bas@coolstreamtech.com>
Date: 2012-12-07 (Fri, 07 Dec 2012)
------------------
This commit was generated by Migit
This commit is contained in:
@@ -1217,7 +1217,7 @@ printf("[neutrino] CSectionsdClient::EVT_GOT_CN_EPG\n");
|
||||
(trkey == RC_plus ) || (trkey == RC_minus ) ||
|
||||
(trkey == RC_page_down ) || (trkey == RC_page_up ) ||
|
||||
((bAllowRepeatLR) && ((trkey == RC_left ) || (trkey == RC_right))) ||
|
||||
((trkey == RC_standby) && (cs_get_revision() > 7)) )
|
||||
(g_settings.shutdown_real_rcdelay && ((trkey == RC_standby) && (cs_get_revision() > 7))) )
|
||||
{
|
||||
#ifdef ENABLE_REPEAT_CHECK
|
||||
if (rc_last_repeat_key != ev.code) {
|
||||
|
Reference in New Issue
Block a user