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

Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/mp/tuxbox

Browse Source 
Conflicts:
	src/neutrino.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 0113efac9f
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-13 (Mon, 13 Nov 2017)



------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2017-11-13 21:25:41 +01:00
parent 3df2c33ff2 38400cc6b5
commit 8df8b37dc2
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/daemonc/remotecontrol.cpp
View File

@@ -542,6 +542,12 @@ void CRemoteControl::processAPIDnames()
#endif #endif
if ( has_unresolved_ctags ) if ( has_unresolved_ctags )
{ {
if ( current_EPGid == 0 ){
const CSectionsdClient::CurrentNextInfo info_CN = g_InfoViewer->getCurrentNextInfo();
if ((info_CN.current_uniqueKey >> 16) == (current_channel_id & 0xFFFFFFFFFFFFULL)){
current_EPGid = info_CN.current_uniqueKey;
}
}
if ( current_EPGid != 0 ) if ( current_EPGid != 0 )
{ {
CSectionsdClient::ComponentTagList tags; CSectionsdClient::ComponentTagList tags;