From a729c6bceebf99446cb6b5b0c63c21b4eec97033 Mon Sep 17 00:00:00 2001 From: Christian Wieninger Date: Tue, 1 May 2012 20:22:49 +0200 Subject: bugtracker #954, epgsearch valgrind warnings, thanks to Joe_D --- menu_conflictcheck.c | 2 +- menu_main.c | 2 +- menu_searchresults.c | 2 +- menu_timersdone.c | 2 +- menu_whatson.c | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/menu_conflictcheck.c b/menu_conflictcheck.c index 45fa0c4..e50b3ba 100644 --- a/menu_conflictcheck.c +++ b/menu_conflictcheck.c @@ -325,7 +325,7 @@ void cMenuConflictCheckDetails::UpdateCurrent() cEventObj* cureventObj = eventObjects.GetCurrent(); if (cureventObj && cureventObj->Event()) for (cMenuConflictCheckDetailsItem *item = (cMenuConflictCheckDetailsItem *)First(); item; item = (cMenuConflictCheckDetailsItem *)Next(item)) - if (item->timerObj && item->timerObj->Event() == cureventObj->Event()) + if (item->Selectable() && item->timerObj && item->timerObj->Event() == cureventObj->Event()) { cureventObj->Select(false); SetCurrent(item); diff --git a/menu_main.c b/menu_main.c index 3ee3e74..3ca3c89 100644 --- a/menu_main.c +++ b/menu_main.c @@ -334,7 +334,7 @@ void cMenuSearchMain::UpdateCurrent() cEventObj* cureventObj = eventObjects.GetCurrent(); if (cureventObj && cureventObj->Event()) for (cMenuMyScheduleItem *item = (cMenuMyScheduleItem *)First(); item; item = (cMenuMyScheduleItem *)Next(item)) - if (item->event == cureventObj->Event()) + if (item->Selectable() && item->event == cureventObj->Event()) { cureventObj->Select(false); SetCurrent(item); diff --git a/menu_searchresults.c b/menu_searchresults.c index 8be6ffd..4c69bee 100644 --- a/menu_searchresults.c +++ b/menu_searchresults.c @@ -388,7 +388,7 @@ void cMenuSearchResults::UpdateCurrent() cEventObj* cureventObj = eventObjects.GetCurrent(); if (cureventObj && cureventObj->Event()) for (cMenuSearchResultsItem* item = (cMenuSearchResultsItem*)First(); item; item = (cMenuSearchResultsItem*)Next(item)) - if (item->event == cureventObj->Event()) + if (item->Selectable() && item->event == cureventObj->Event()) { cureventObj->Select(false); SetCurrent(item); diff --git a/menu_timersdone.c b/menu_timersdone.c index 47d7f17..c122f1c 100644 --- a/menu_timersdone.c +++ b/menu_timersdone.c @@ -108,7 +108,7 @@ void cMenuTimersDone::UpdateCurrent() cEventObj* cureventObj = eventObjects.GetCurrent(); if (cureventObj && cureventObj->Event()) for (cMenuTimerDoneItem *item = (cMenuTimerDoneItem *)First(); item; item = (cMenuTimerDoneItem *)Next(item)) - if (item->timerDone->GetEvent() == cureventObj->Event()) + if (item->Selectable() && item->timerDone->GetEvent() == cureventObj->Event()) { cureventObj->Select(false); SetCurrent(item); diff --git a/menu_whatson.c b/menu_whatson.c index 24a520e..e094a80 100644 --- a/menu_whatson.c +++ b/menu_whatson.c @@ -701,7 +701,7 @@ void cMenuWhatsOnSearch::UpdateCurrent() cEventObj* cureventObj = eventObjects.GetCurrent(); if (cureventObj && cureventObj->Event()) for (cMenuMyScheduleItem *item = (cMenuMyScheduleItem *)First(); item; item = (cMenuMyScheduleItem *)Next(item)) - if (item->event == cureventObj->Event()) + if (item->Selectable() && item->event == cureventObj->Event()) { cureventObj->Select(false); SetCurrent(item); -- cgit v1.2.3