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

src/gui/eventlist.cpp restore channel name after call search if not used

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: be2417068e
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2016-06-01 (Wed, 01 Jun 2016)


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

------------------
This commit was generated by Migit
This commit is contained in:
Jacek Jendrzej
2016-06-01 15:41:08 +02:00
parent 9ebf5261fa
commit 7e62915fdf
2 changed files with 12 additions and 13 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; oldIndex = -1;
oldEventID = -1; oldEventID = -1;
bgRightBoxPaint = false; bgRightBoxPaint = false;
in_search = findEvents(); in_search = findEvents(channel_id, channelname);
timeoutEnd = CRCInput::calcTimeoutEnd(g_settings.timing[SNeutrinoSettings::TIMING_EPG]); timeoutEnd = CRCInput::calcTimeoutEnd(g_settings.timing[SNeutrinoSettings::TIMING_EPG]);
} }
else if (msg == CRCInput::RC_sat || msg == CRCInput::RC_favorites || msg == CRCInput::RC_www) { else if (msg == CRCInput::RC_sat || msg == CRCInput::RC_favorites || msg == CRCInput::RC_www) {
@@ -1034,12 +1034,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; bool res = false;
int event = 0; int event = 0;
t_channel_id channel_id = 0;
if((m_search_keyword.empty() || m_search_keyword == m_search_autokeyword) && evtlist[selected].eventID != 0) if((m_search_keyword.empty() || m_search_keyword == m_search_autokeyword) && evtlist[selected].eventID != 0)
{ {
@@ -1130,14 +1129,11 @@ bool CEventList::findEvents(void)
} }
if(evtlist.empty()) if(evtlist.empty())
{ {
if ( evtlist.empty() ) CChannelEvent evt;
{ //evt.description = m_search_keyword + ": " + g_Locale->getText(LOCALE_EPGVIEWER_NOTFOUND);
CChannelEvent evt; evt.description = g_Locale->getText(LOCALE_EPGVIEWER_NOTFOUND);
//evt.description = m_search_keyword + ": " + g_Locale->getText(LOCALE_EPGVIEWER_NOTFOUND); evt.eventID = 0;
evt.description = g_Locale->getText(LOCALE_EPGVIEWER_NOTFOUND); evtlist.push_back(evt);
evt.eventID = 0;
evtlist.push_back(evt);
}
} }
if (current_event == (unsigned int)-1) if (current_event == (unsigned int)-1)
current_event = 0; current_event = 0;
@@ -1163,7 +1159,10 @@ bool CEventList::findEvents(void)
} }
} }
paintHead(0, search_head_name); if(event)
paintHead(0, search_head_name);
else
paintHead(channel_id, channelname);
paint(); paint();
showFunctionBar(true, channel_id); showFunctionBar(true, channel_id);
return(res); return(res);

2
src/gui/eventlist.h
View File

@@ -79,7 +79,7 @@ class CEventList : public CListHelpers
event_id_t oldEventID; event_id_t oldEventID;
bool bgRightBoxPaint; bool bgRightBoxPaint;
bool findEvents(void); bool findEvents(t_channel_id channel_id, std::string channelname);
// Eventfinder end // Eventfinder end
CFrameBuffer *frameBuffer; CFrameBuffer *frameBuffer;