From 6da16af54f9504aa0fa2e97d3b0217e183867287 Mon Sep 17 00:00:00 2001
From: Andreas Brachold <vdr07@deltab.de>
Date: Mon, 13 Aug 2007 19:07:27 +0000
Subject: * AUTOTIMER : Fix typo at logging * TIMER : modt on delete only if
 timer active

---
 lib/XXV/MODULES/AUTOTIMER.pm | 2 +-
 lib/XXV/MODULES/TIMERS.pm    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'lib')

diff --git a/lib/XXV/MODULES/AUTOTIMER.pm b/lib/XXV/MODULES/AUTOTIMER.pm
index 812da07..391c923 100644
--- a/lib/XXV/MODULES/AUTOTIMER.pm
+++ b/lib/XXV/MODULES/AUTOTIMER.pm
@@ -856,7 +856,7 @@ sub autotimerEdit {
 
         $console->message(gettext('Autotimer saved!'));
         debug sprintf('%s autotimer with search "%s" is saved%s',
-            ($timerid ? 'New' : 'Changed'),
+            ($timerid ? 'Changed' : 'New'),
             $data->{Search},
             ( $console->{USER} && $console->{USER}->{Name} ? sprintf(' from user: %s', $console->{USER}->{Name}) : "" )
             );
diff --git a/lib/XXV/MODULES/TIMERS.pm b/lib/XXV/MODULES/TIMERS.pm
index b20f67d..14f60fa 100644
--- a/lib/XXV/MODULES/TIMERS.pm
+++ b/lib/XXV/MODULES/TIMERS.pm
@@ -786,7 +786,7 @@ sub deleteTimer {
 
     my @timers  = reverse sort{ $a <=> $b } split(/[^0-9]/, $timerid);
 
-    my $sql = sprintf('SELECT Id,File,ChannelID,NextStartTime,IF(NOW() between NextStartTime and NextStopTime,1,0) as Running FROM TIMERS where Id in (%s)', join(',' => ('?') x @timers)); 
+    my $sql = sprintf('SELECT Id,File,ChannelID,NextStartTime,IF(Status & 1 and NOW() between NextStartTime and NextStopTime,1,0) as Running FROM TIMERS where Id in (%s)', join(',' => ('?') x @timers)); 
     my $sth = $obj->{dbh}->prepare($sql);
     $sth->execute(@timers)
         or return error sprintf("Can't execute query: %s.",$sth->errstr);
-- 
cgit v1.2.3