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 'cst-next' of git://coolstreamtech.de/cst-public-gui-neutrino into ni/cst-next

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: 283cd4640f
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-06-02 (Thu, 02 Jun 2016)


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

------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2016-06-02 21:13:16 +02:00
parent 3cb63740d5 75dc6e0027
commit d9980f2d87
5 changed files with 21 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/gui/eventlist.cpp
View File

@@ -647,7 +647,7 @@ int CEventList::exec(const t_channel_id channel_id, const std::string& channelna
oldIndex = -1;
oldEventID = -1;
bgRightBoxPaint = false;
in_search = findEvents();
in_search = findEvents(channel_id, channelname);
timeoutEnd = CRCInput::calcTimeoutEnd(g_settings.timing[SNeutrinoSettings::TIMING_EPG]);
}
else if (msg == CRCInput::RC_sat || msg == CRCInput::RC_favorites || msg == CRCInput::RC_www) {
@@ -1047,12 +1047,11 @@ int CEventListHandler::exec(CMenuTarget* parent, const std::string &/*actionkey*
}
/************************************************************************************************/
bool CEventList::findEvents(void)
bool CEventList::findEvents(t_channel_id channel_id, std::string channelname)
/************************************************************************************************/
{
bool res = false;
int event = 0;
t_channel_id channel_id = 0;
if((m_search_keyword.empty() || m_search_keyword == m_search_autokeyword) && evtlist[selected].eventID != 0)
{
@@ -1143,14 +1142,11 @@ bool CEventList::findEvents(void)
}
if(evtlist.empty())
{
if ( evtlist.empty() )
{
CChannelEvent evt;
//evt.description = m_search_keyword + ": " + g_Locale->getText(LOCALE_EPGVIEWER_NOTFOUND);
evt.description = g_Locale->getText(LOCALE_EPGVIEWER_NOTFOUND);
evt.eventID = 0;
evtlist.push_back(evt);
}
CChannelEvent evt;
//evt.description = m_search_keyword + ": " + g_Locale->getText(LOCALE_EPGVIEWER_NOTFOUND);
evt.description = g_Locale->getText(LOCALE_EPGVIEWER_NOTFOUND);
evt.eventID = 0;
evtlist.push_back(evt);
}
if (current_event == (unsigned int)-1)
current_event = 0;
@@ -1176,7 +1172,10 @@ bool CEventList::findEvents(void)
}
}
paintHead(0, search_head_name);
if(event)
paintHead(0, search_head_name);
else
paintHead(channel_id, channelname);
paint();
showFunctionBar(true, channel_id);
return(res);