diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/XXV/MODULES/CHANNELS.pm | 2 | ||||
| -rw-r--r-- | lib/XXV/MODULES/TIMERS.pm | 9 |
2 files changed, 1 insertions, 10 deletions
diff --git a/lib/XXV/MODULES/CHANNELS.pm b/lib/XXV/MODULES/CHANNELS.pm index 755108b..c8771a1 100644 --- a/lib/XXV/MODULES/CHANNELS.pm +++ b/lib/XXV/MODULES/CHANNELS.pm @@ -1004,7 +1004,7 @@ sub deleteChannel { $self->readData($watcher,$console); $console->redirect({url => '?cmd=clist', wait => 1}) - if(ref $console and $console->typ eq 'HTML'); + if(ref $console and $console->typ eq 'HTML' and !$self->{svdrp}->err); } else { con_err($console, gettext("No channel defined for deletion!")); } diff --git a/lib/XXV/MODULES/TIMERS.pm b/lib/XXV/MODULES/TIMERS.pm index 5d25b14..150bc71 100644 --- a/lib/XXV/MODULES/TIMERS.pm +++ b/lib/XXV/MODULES/TIMERS.pm @@ -1471,15 +1471,6 @@ where } # ------------------ -sub getEvents { -# ------------------ - my $obj = shift || return error('No object defined!'); - my $sql = "SELECT SQL_CACHE id, flags & 1 as activ, eventid from TIMERS where eventid > 0"; - my $erg = $obj->{dbh}->selectall_hashref($sql, 'eventid'); - return $erg; -} - -# ------------------ sub getEpgDesc { # ------------------ my $obj = shift || return error('No object defined!'); |