summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--HISTORY5
-rw-r--r--HISTORY.DE4
-rw-r--r--epgsearch.c2
-rw-r--r--epgsearchtools.c2
-rw-r--r--recdone.c2
5 files changed, 11 insertions, 4 deletions
diff --git a/HISTORY b/HISTORY
index 6d861e5..f83c7cf 100644
--- a/HISTORY
+++ b/HISTORY
@@ -13,7 +13,10 @@ new:
the summary of the current event. If any epgsearch menu is open a subsequent
SVDRP call will close it again.
- changed the maximum number of days for a timer conflict check from 99 to 14
-
+- patch by Jörg Wendel for new graphtft patch
+- Two events with both empty episode names are now handled different within the
+ feature 'Avoid repeats'. This will result in more recordings, but ensures not to
+ miss one only because of a buggy EPG.
fixes:
- fixed a crash when pressing 'Ok' in an empty timers done menu
- fixed a crash when using the progressbar and events with 0 duration exist, thanks
diff --git a/HISTORY.DE b/HISTORY.DE
index d12cbd7..8ec4237 100644
--- a/HISTORY.DE
+++ b/HISTORY.DE
@@ -14,6 +14,10 @@ neu:
geöffnet ist, schließt ein weiteres SVDRP-Kommando dieses wieder.
- Die maximale Anzahl von Tagen für eine Timerkonfliktprüfung ist nun von 99 auf
14 geändert.
+- Patch von Jörg Wendel für neuen graphtft-Patch
+- Zwei Episoden mit leerem Untertitel innerhalb 'Vermeide Wiederholung' werden
+ jetzt als unterschiedlich gewertet. Damit ergeben sich mehr Aufnahmen, aber es
+ wird verhindert, dass man eine Folge nur wegen eines fehlerhaften EPGs verpasst.
fixes:
- Absturz beim Drücken von 'Ok' in leerem Menü erledigter Timer behoben
- Absturz bei Verwendung des Fortschrittsbalkens in Verbindung mit Sendungen
diff --git a/epgsearch.c b/epgsearch.c
index b7ffc15..0721523 100644
--- a/epgsearch.c
+++ b/epgsearch.c
@@ -69,7 +69,7 @@ The project's page is at http://winni.vdr-developer.org/epgsearch
#include <langinfo.h>
#endif
-static const char VERSION[] = "0.9.25.beta5";
+static const char VERSION[] = "0.9.25.beta6";
static const char DESCRIPTION[] = trNOOP("search the EPG for repeats and more");
// globals
diff --git a/epgsearchtools.c b/epgsearchtools.c
index a4f4614..8ae1493 100644
--- a/epgsearchtools.c
+++ b/epgsearchtools.c
@@ -831,7 +831,7 @@ bool EventsMatch(const cEvent* event1, const cEvent* event2, bool compareTitle,
bool match = false;
if ((!compareTitle || Title1 == Title2) &&
- (!compareSubtitle || Subtitle1 == Subtitle2))
+ (!compareSubtitle || (Subtitle1 == Subtitle2 && Subtitle1!="")))
{
const char* Descr1 = event1->Description();
const char* Descr2 = event2->Description();
diff --git a/recdone.c b/recdone.c
index 11a195d..790b212 100644
--- a/recdone.c
+++ b/recdone.c
@@ -295,7 +295,7 @@ int cRecsDone::GetCountRecordings(const cEvent* event, bool compareTitle, bool c
}
if ((!compareTitle || rTitle == eTitle) &&
- (!compareSubtitle || rSubtitle == eSubtitle) &&
+ (!compareSubtitle || (rSubtitle == eSubtitle && rSubtitle !="")) &&
(!compareSummary || DescriptionMatches(eRawDescr.c_str(), rRawDescr.c_str())))
{
if (catvaluesAvoidRepeat != 0) // check categories