summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Wieninger <cwieninger@gmx.de>2012-05-01 20:22:49 +0200
committerChristian Wieninger <cwieninger@gmx.de>2012-05-01 20:22:49 +0200
commita729c6bceebf99446cb6b5b0c63c21b4eec97033 (patch)
tree361b667e700ec5137ca5291081a3c955c5bc2bdc
parent3bd2658c85f00269583259d5912c88f031b9599f (diff)
downloadvdr-plugin-epgsearch-a729c6bceebf99446cb6b5b0c63c21b4eec97033.tar.gz
vdr-plugin-epgsearch-a729c6bceebf99446cb6b5b0c63c21b4eec97033.tar.bz2
bugtracker #954, epgsearch valgrind warnings, thanks to Joe_D
-rw-r--r--menu_conflictcheck.c2
-rw-r--r--menu_main.c2
-rw-r--r--menu_searchresults.c2
-rw-r--r--menu_timersdone.c2
-rw-r--r--menu_whatson.c2
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);