summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--HISTORY3
-rw-r--r--HISTORY.DE2
-rw-r--r--epgsearchext.c5
-rw-r--r--epgsearchext.h1
-rw-r--r--searchtimer_thread.c2
5 files changed, 11 insertions, 2 deletions
diff --git a/HISTORY b/HISTORY
index e75c671..6bb2c7a 100644
--- a/HISTORY
+++ b/HISTORY
@@ -62,7 +62,8 @@ fixes:
- the day selection menu in the timer edit menu was hidden
- if an event was matched by multiple search timers with 'announce only' setting, it was
also listed more than once. Thanks to Andreas Mair for reporting.
-
+- fixed a bug in search timer announcements concerning the display of the corresponding
+ search timer
2008-04-29: Version 0.9.24
new:
diff --git a/HISTORY.DE b/HISTORY.DE
index 6db8c9b..ee08020 100644
--- a/HISTORY.DE
+++ b/HISTORY.DE
@@ -67,6 +67,8 @@ fixes:
- Im Timer-Edit-Menu war das Menu zur Tagesauswahl nicht mehr sichtbar
- Wurde eine Sendung von mehreren Suchtimern mit "Nur ankündigen" gefunden, wurde sie auch
mehrfach gelistet, Danke an Andreas Mair für den Hinweis.
+- Fehler bei "Nur ankündigen"-Suchtimer im Zusammenhang mit der Anzeige des zugehörigen Such-
+ timernamens korrigiert.
2008-04-29: Version 0.9.24
diff --git a/epgsearchext.c b/epgsearchext.c
index fa9ad71..79bfd70 100644
--- a/epgsearchext.c
+++ b/epgsearchext.c
@@ -1562,3 +1562,8 @@ bool cSearchExts::CheckForAutoDelete(cSearchExt* SearchExt)
}
return delSearch;
}
+
+cSearchResult::cSearchResult(const cEvent* Event, int searchID) : event(Event), blacklist(NULL), needsTimer(true)
+{
+ search = SearchExts.GetSearchFromID(searchID);
+}
diff --git a/epgsearchext.h b/epgsearchext.h
index dda5e15..40015ba 100644
--- a/epgsearchext.h
+++ b/epgsearchext.h
@@ -63,6 +63,7 @@ class cSearchResult : public cListObject {
const cBlacklist* blacklist;
bool needsTimer;
cSearchResult(const cEvent* Event, const cSearchExt* Search) : event(Event), search(Search), blacklist(NULL), needsTimer(true) {}
+ cSearchResult(const cEvent* Event, int searchID);
cSearchResult(const cEvent* Event, const cBlacklist* Blacklist) : event(Event), search(NULL), blacklist(Blacklist), needsTimer(true) {}
};
diff --git a/searchtimer_thread.c b/searchtimer_thread.c
index 82a1119..57d69e9 100644
--- a/searchtimer_thread.c
+++ b/searchtimer_thread.c
@@ -417,7 +417,7 @@ void cSearchTimerThread::Action(void)
continue;
}
if (!announceList.Lookup(pEvent))
- announceList.Add(new cSearchResult(pEvent, searchExt));
+ announceList.Add(new cSearchResult(pEvent, searchExt->ID));
if (Summary) free(Summary);
delete timer;