changed the maximum number of days for a timer conflict check from 99 to 14

5 files changed, 7 insertions, 5 deletions

diff --git a/HISTORY b/HISTORY
index 50a148d..6d861e5 100644
--- a/HISTORY
+++ b/HISTORY
@@ -12,6 +12,7 @@ new:
 - new SVDRP command 'MENU [NOW|PRG|SUM]' to call one of the main OSD menus or 
   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
 
 fixes:
 - fixed a crash when pressing 'Ok' in an empty timers done menu
diff --git a/HISTORY.DE b/HISTORY.DE
index f6d33ed..d12cbd7 100644
--- a/HISTORY.DE
+++ b/HISTORY.DE
@@ -12,7 +12,8 @@ neu:
 - neues SVDRP-Kommando 'MENU [NOW|PRG|SUM]' zum Aufruf eines der OSD-Hauptmenüs
   oder der Inhaltsangabe der aktuellen Sendung. Falls irgendein epgsearch-Menü 
   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.
 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/conflictcheck.c b/conflictcheck.c
index 2118a7d..2c29b38 100644
--- a/conflictcheck.c
+++ b/conflictcheck.c
@@ -248,7 +248,7 @@ cList<cConflictCheckTimerObj>* cConflictCheck::CreateCurrentTimerList()
     }
 
     // collect repeating timers from now until the date of the timer with tMax
-    time_t maxCheck = time(NULL) + EPGSearchConfig.checkMaxDays * SECSINDAY;
+    time_t maxCheck = time(NULL) + min(14,EPGSearchConfig.checkMaxDays) * SECSINDAY;
     tMax = max(tMax, maxCheck);
     for (ti = Timers.First(); ti; ti = Timers.Next(ti))
     {
@@ -359,7 +359,7 @@ cList<cConflictCheckTime>* cConflictCheck::CreateConflictList(cList<cConflictChe
     LogFile.Log(3,"create conflict list");
     relevantConflicts = 0;
     numConflicts = 0;
-    maxCheck = time(NULL) + EPGSearchConfig.checkMaxDays * SECSINDAY;
+    maxCheck = time(NULL) + min(14, EPGSearchConfig.checkMaxDays) * SECSINDAY;
 
     // check each time
     for(cConflictCheckTime* checkTime = EvalTimeList->First(); checkTime; checkTime = EvalTimeList->Next(checkTime))
diff --git a/epgsearchcfg.c b/epgsearchcfg.c
index 204196b..c72a6f3 100644
--- a/epgsearchcfg.c
+++ b/epgsearchcfg.c
@@ -46,7 +46,7 @@ cEPGSearchConfig::cEPGSearchConfig(void)
   checkTimerConflictsAfterUpdate = 0;
   checkMinPriority = 0;
   checkMinDuration = 0;
-  checkMaxDays = 99;
+  checkMaxDays = 14;
   ignorePayTV     = 0;
   useExternalSVDRP = 0;
   ignorePrimary = 0;
diff --git a/epgsearchsetup.c b/epgsearchsetup.c
index b34337d..2332a94 100644
--- a/epgsearchsetup.c
+++ b/epgsearchsetup.c
@@ -764,7 +764,7 @@ void cMenuSetupTimerConflicts::Set()
   AddHelp(tr("Help$If a timer with priority below the given value will fail it will not be classified as important. Only important conflicts will produce an OSD message about the conflict after an automatic conflict check."));
   Add(new cMenuEditIntItem(tr("Ignore conflict duration less ... min."), &data->checkMinDuration, 0, 999));
   AddHelp(tr("Help$If a conflicts duration is less then the given number of minutes it will not be classified as important. Only important conflicts will produce an OSD message about the conflict after an automatic conflict check."));
-  Add(new cMenuEditIntItem(tr("Only check within next ... days"), &data->checkMaxDays, 1, 99));
+  Add(new cMenuEditIntItem(tr("Only check within next ... days"), &data->checkMaxDays, 1, 14));
   AddHelp(tr("Help$This value reduces the conflict check to the given range of days. All other conflicts are classified as 'not yet important'."));
 
   cOsdItem* sep = new cOsdItem(tr("--- Automatic checking ---"));