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

Neutrino timer list: remove unnecessary check for last deleted event

Browse Source 
timerd client already filters deleted events (TIMERSTATE_TERMINATED)
sent from timerd

Signed-off-by: Christian Schuett <Gaucho316@hotmail.com>
Signed-off-by: Thilo Graf <dbt@novatux.de>


Origin commit data
------------------
Branch: ni/coolstream
Commit: 0a4e9e8640
Author: Christian Schuett <Gaucho316@hotmail.com>
Date: 2014-02-14 (Fri, 14 Feb 2014)



------------------
This commit was generated by Migit
This commit is contained in:
Christian Schuett
2014-02-14 18:10:04 +01:00
committed by Jacek Jendrzej
parent b492148034
commit a3e5c42a33
2 changed files with 0 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/gui/timerlist.cpp
View File

@@ -262,7 +262,6 @@ CTimerList::CTimerList()
liststart = 0; liststart = 0;
listmaxshow = 0; listmaxshow = 0;
Timer = new CTimerdClient(); Timer = new CTimerdClient();
skipEventID=0;
timerNew_message = ""; timerNew_message = "";
timerNew_pluginName = ""; timerNew_pluginName = "";
@@ -434,16 +433,6 @@ void CTimerList::updateEvents(void)
{ {
timerlist.clear(); timerlist.clear();
Timer->getTimerList (timerlist); Timer->getTimerList (timerlist);
//Remove last deleted event from List
CTimerd::TimerList::iterator timer = timerlist.begin();
for (; timer != timerlist.end(); ++timer)
{
if (timer->eventID==skipEventID)
{
timerlist.erase(timer);
break;
}
}
sort(timerlist.begin(), timerlist.end()); sort(timerlist.begin(), timerlist.end());
theight = g_Font[SNeutrinoSettings::FONT_TYPE_MENU_TITLE]->getHeight(); theight = g_Font[SNeutrinoSettings::FONT_TYPE_MENU_TITLE]->getHeight();
@@ -613,7 +602,6 @@ int CTimerList::show()
} }
if (killTimer) { if (killTimer) {
Timer->removeTimerEvent(timerlist[selected].eventID); Timer->removeTimerEvent(timerlist[selected].eventID);
skipEventID=timerlist[selected].eventID;
update = true; update = true;
} }
} }

2
src/gui/timerlist.h
View File

@@ -73,8 +73,6 @@ class CTimerList : public CMenuTarget
int timer_apids_ac3; int timer_apids_ac3;
int timer_apids_alt; int timer_apids_alt;
int skipEventID;
void paintItem(int pos); void paintItem(int pos);
void paint(); void paint();
void paintHead(); void paintHead();