From a3e5c42a33a1afd25091cb6fccc3e7ef27b05101 Mon Sep 17 00:00:00 2001 From: Christian Schuett Date: Fri, 14 Feb 2014 18:10:04 +0100 Subject: [PATCH] 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 Signed-off-by: Thilo Graf Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/0a4e9e8640416527a591b53795a302cfd2596651 Author: Christian Schuett Date: 2014-02-14 (Fri, 14 Feb 2014) ------------------ This commit was generated by Migit --- src/gui/timerlist.cpp | 12 ------------ src/gui/timerlist.h | 2 -- 2 files changed, 14 deletions(-) diff --git a/src/gui/timerlist.cpp b/src/gui/timerlist.cpp index 4c26a2d70..eab57ce56 100644 --- a/src/gui/timerlist.cpp +++ b/src/gui/timerlist.cpp @@ -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; } } diff --git a/src/gui/timerlist.h b/src/gui/timerlist.h index 137eb6286..1139bd3b7 100644 --- a/src/gui/timerlist.h +++ b/src/gui/timerlist.h @@ -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();