diff options
| author | Andreas Brachold <vdr07@deltab.de> | 2010-09-12 18:50:55 +0000 |
|---|---|---|
| committer | Andreas Brachold <vdr07@deltab.de> | 2010-09-12 18:50:55 +0000 |
| commit | 077bfb773516ce03460433b3c31281805ea28c41 (patch) | |
| tree | ef3c80aaf57456c0b2a22104cba97443565fd564 /lib | |
| parent | 81b22ed394e9e7445ccb6e762805f3f3fdb8b7be (diff) | |
| download | xxv-077bfb773516ce03460433b3c31281805ea28c41.tar.gz xxv-077bfb773516ce03460433b3c31281805ea28c41.tar.bz2 | |
TIMERS: handle epg-events improve on multi recorder environment
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/XXV/MODULES/CHANNELS.pm | 2 | ||||
| -rw-r--r-- | lib/XXV/MODULES/TIMERS.pm | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/lib/XXV/MODULES/CHANNELS.pm b/lib/XXV/MODULES/CHANNELS.pm index 0d5fb20..a65de26 100644 --- a/lib/XXV/MODULES/CHANNELS.pm +++ b/lib/XXV/MODULES/CHANNELS.pm @@ -814,7 +814,7 @@ sub ChannelArray { my $where = shift || ''; $where = sprintf('WHERE %s', $where) if($where); - my $sql = sprintf('SELECT SQL_CACHE %s, pos from CHANNELS %s order by pos', $field, $where); + my $sql = sprintf('SELECT SQL_CACHE %s, pos from CHANNELS %s GROUP BY id order by pos', $field, $where); my $erg = $self->{dbh}->selectall_arrayref($sql); return $erg; } diff --git a/lib/XXV/MODULES/TIMERS.pm b/lib/XXV/MODULES/TIMERS.pm index 1bc2cde..d8754fb 100644 --- a/lib/XXV/MODULES/TIMERS.pm +++ b/lib/XXV/MODULES/TIMERS.pm @@ -1477,6 +1477,7 @@ SELECT SQL_CACHE t.id, t.vid, t.pos, t.flags, t.channel, t.priority, t.lifetime, FROM TIMERS as t, EPG as e WHERE e.eventid > 0 AND t.eventid = e.eventid + AND t.vid = e.vid AND ( (((t.flags & 4) = 0) AND e.starttime != t.eventstarttime) OR ((t.flags & 4) AND e.vpstime != t.eventstarttime) |