From e0497c2295fb75e5cb97136fcdd08c321c6aba03 Mon Sep 17 00:00:00 2001
From: Andreas Brachold <vdr07@deltab.de>
Date: Fri, 16 May 2008 20:07:19 +0000
Subject: * TIMERS: Collision ignore CA > 16

---
 lib/XXV/MODULES/TIMERS.pm | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

(limited to 'lib')

diff --git a/lib/XXV/MODULES/TIMERS.pm b/lib/XXV/MODULES/TIMERS.pm
index e16f23b..4192dda 100644
--- a/lib/XXV/MODULES/TIMERS.pm
+++ b/lib/XXV/MODULES/TIMERS.pm
@@ -1635,8 +1635,10 @@ ORDER BY
 
     # try to assign timer to dvb cards
     foreach my $ti (@{$timer}) {
-      my $CardOnly = CORE::int($ti->[fCardOnly]);
-      $CardOnly = 0 if($CardOnly >= 16);
+      my $CardOnly = 0;
+      if($ti->[fCardOnly] =~ /^(\d+)$/ && $1 < 15) {
+        $CardOnly = $1;
+      } 
       for my $ca (@{$CARDS}) {
         if(!($ti->[fCardUsed]) # If'nt assign
  #          && $ca->{Host} eq $ti->[fHost] # Same host
@@ -1660,8 +1662,10 @@ ORDER BY
       $rerun = 0;
       foreach my $ti (@{$timer}) {
         unless($ti->[fCardUsed]) { # used card
-          my $CardOnly = CORE::int($ti->[fCardOnly]);
-          $CardOnly = 0 if($CardOnly >= 16);
+          my $CardOnly = 0;
+          if($ti->[fCardOnly] =~ /^(\d+)$/ && $1 < 15) {
+            $CardOnly = $1;
+          } 
           foreach my $co (@{$timer}) {
             if($ti->[fid] ne $co->[fid]
                 && $co->[fCardUsed] # used card
-- 
cgit v1.2.3