mirror of
https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git
synced 2025-08-29 08:21:07 +02:00
Neutrino timer list: remove unnecessary check for last deleted event
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:
committed by
Jacek Jendrzej
parent
b492148034
commit
a3e5c42a33
@@ -262,7 +262,6 @@ CTimerList::CTimerList()
|
||||
liststart = 0;
|
||||
listmaxshow = 0;
|
||||
Timer = new CTimerdClient();
|
||||
skipEventID=0;
|
||||
timerNew_message = "";
|
||||
timerNew_pluginName = "";
|
||||
|
||||
@@ -434,16 +433,6 @@ void CTimerList::updateEvents(void)
|
||||
{
|
||||
timerlist.clear();
|
||||
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());
|
||||
|
||||
theight = g_Font[SNeutrinoSettings::FONT_TYPE_MENU_TITLE]->getHeight();
|
||||
@@ -613,7 +602,6 @@ int CTimerList::show()
|
||||
}
|
||||
if (killTimer) {
|
||||
Timer->removeTimerEvent(timerlist[selected].eventID);
|
||||
skipEventID=timerlist[selected].eventID;
|
||||
update = true;
|
||||
}
|
||||
}
|
||||
|
@@ -73,8 +73,6 @@ class CTimerList : public CMenuTarget
|
||||
int timer_apids_ac3;
|
||||
int timer_apids_alt;
|
||||
|
||||
int skipEventID;
|
||||
|
||||
void paintItem(int pos);
|
||||
void paint();
|
||||
void paintHead();
|
||||
|
Reference in New Issue
Block a user