From patchwork Fri Sep  9 15:25:54 2005
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Klaus Schmidinger <Klaus.Schmidinger@cadsoft.de>
X-Patchwork-Id: 12013
Received: from tiger.cadsoft.de ([217.7.101.210])
	by www.linuxtv.org with esmtp (Exim 4.34) id 1EDklL-0008NY-Ec
	for vdr@linuxtv.org; Fri, 09 Sep 2005 17:25:59 +0200
Received: from raven.cadsoft.de (raven.cadsoft.de [217.7.101.211])
	by tiger.cadsoft.de (8.12.7/8.12.7) with ESMTP id j89FPvrc030619
	for <vdr@linuxtv.org>; Fri, 9 Sep 2005 17:25:58 +0200
Received: from [192.168.100.10] (hawk.cadsoft.de [192.168.100.10])
	by raven.cadsoft.de (8.13.3/8.13.3) with ESMTP id j89FPv1X012671
	for <vdr@linuxtv.org>; Fri, 9 Sep 2005 17:25:57 +0200
Message-ID: <4321A982.2080304@cadsoft.de>
Date: Fri, 09 Sep 2005 17:25:54 +0200
From: Klaus Schmidinger <Klaus.Schmidinger@cadsoft.de>
Organization: CadSoft Computer GmbH
User-Agent: Mozilla Thunderbird 1.0.6 (X11/20050716)
X-Accept-Language: en
MIME-Version: 1.0
To: vdr@linuxtv.org
Subject: Re: [vdr] 1.3.30 Bug: SVDRP timer installation
References: <20050906090313.GA4884@vdr.gulu.net>
In-Reply-To: <20050906090313.GA4884@vdr.gulu.net>
X-Greylist: Sender DNS name whitelisted, not delayed by milter-greylist-2.0
	(tiger.cadsoft.de [217.7.101.210]);
	Fri, 09 Sep 2005 17:25:58 +0200 (CEST)
X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-2.0
	(raven.cadsoft.de [192.168.1.1]);
	Fri, 09 Sep 2005 17:25:57 +0200 (CEST)
X-BeenThere: vdr@linuxtv.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: Klaus Schmidinger's VDR <vdr@linuxtv.org>
List-Id: Klaus Schmidinger's VDR <vdr.linuxtv.org>
List-Unsubscribe: <http://www.linuxtv.org/cgi-bin/mailman/listinfo/vdr>,
	<mailto:vdr-request@linuxtv.org?subject=unsubscribe>
List-Archive: <http://www.linuxtv.org/pipermail/vdr>
List-Post: <mailto:vdr@linuxtv.org>
List-Help: <mailto:vdr-request@linuxtv.org?subject=help>
List-Subscribe: <http://www.linuxtv.org/cgi-bin/mailman/listinfo/vdr>,
	<mailto:vdr-request@linuxtv.org?subject=subscribe>
X-List-Received-Date: Fri, 09 Sep 2005 15:25:59 -0000
Status: O
X-Status: 
X-Keywords: 
X-UID: 4846

Patrick Rother wrote:
> Hello.
> 
> There seems to be a bug in timer handling.
> 
> Please see this SVDRP snapshot:
> 
> 220 vdr SVDRP VideoDiskRecorder 1.3.30; Tue Sep  6 10:50:38 2005
> newt 1:S19.2E-133-33-46:----F--:2213:2250:90:30:Sechserpack:
> 550 Timer already defined: 12 1:5:-D-----:2213:2250:40:10:Mensch_Markus:
> lstt 12
> 250 12 1:5:-D-----:2213:2250:40:10:Mensch_Markus:
> newt 1:S19.2E-133-33-46:----F--:2213:2250:90:30:Sechserpack:
> 550 Timer already defined: 12 1:5:-D-----:2213:2250:40:10:Mensch_Markus:
> 
> vdr 1.3.30 refuses to install a weekly timer with same start/stop
> time for a different day of week.
> 
> I get the new timer in by modifying start to by one minute, so this
> has no actual service impact, but this shall be fixed anyway.

Please try the attached patch.

Klaus

--- timers.c	2005/09/04 10:53:21	1.35
+++ timers.c	2005/09/09 15:22:33
@@ -519,7 +519,10 @@
 cTimer *cTimers::GetTimer(cTimer *Timer)
 {
   for (cTimer *ti = First(); ti; ti = Next(ti)) {
-      if (ti->Channel() == Timer->Channel() && ti->Day() == Timer->Day() && ti->Start() == Timer->Start() && ti->Stop() == Timer->Stop())
+      if (ti->Channel() == Timer->Channel() &&
+          (ti->WeekDays() && ti->WeekDays() == Timer->WeekDays() || !ti->WeekDays() && ti->Day() == Timer->Day()) &&
+          ti->Start() == Timer->Start() &&
+          ti->Stop() == Timer->Stop())
          return ti;
       }
   return NULL;