From 482e1fb597690b1edee54fb3c3c62fa6fa575c69 Mon Sep 17 00:00:00 2001 From: hummypkg Date: Thu, 13 Oct 2016 19:05:04 +0000 Subject: [PATCH] fix schedule restore git-svn-id: file:///root/webif/svn/pkg/webif/trunk@3319 2a923420-c742-0410-a762-8d5b09965624 --- CONTROL/control | 2 +- webif/lib/rsv.class | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CONTROL/control b/CONTROL/control index 7ba77bf..c03f0d5 100644 --- a/CONTROL/control +++ b/CONTROL/control @@ -1,7 +1,7 @@ Package: webif Priority: optional Section: web -Version: 1.3.2-7 +Version: 1.3.2-8 Architecture: mipsel Maintainer: af123@hpkg.tv Depends: tcpfix,webif-channelicons(>=1.1.24),lighttpd(>=1.4.39-1),jim(>=0.76-2),jim-oo,jim-sqlite3(>=0.76),jim-cgi(>=0.7-1),jim-binary(>=0.76),service-control(>=2.1),busybox(>=1.20.2-1),lsof(>=4.87),epg(>=1.2.3),hmt(>=2.0.10),ssmtp,cron-daemon(>=1.18.3-3),at(>=3.1.18),anacron,trm(>=1.1),openssl-command,nicesplice,id3v2,file,rsvsync(>=1.1.9),webif-charts(>=1.2-1),stripts(>=1.2.5-3),tmenu(>=1.08),ffmpeg,id3v2,multienv(>=1.6),tcpping(>=1.1),e2fsprogs,wireless-tools(>=29-1),dbupdate,recmon(>=2.0.7),hwctl,nugget(>=0.95) diff --git a/webif/lib/rsv.class b/webif/lib/rsv.class index 8172f71..477c5af 100755 --- a/webif/lib/rsv.class +++ b/webif/lib/rsv.class @@ -359,7 +359,7 @@ rsv method insert {{table pending} {force 0} {defer 0}} { set now [clock seconds] # In-progress check - if {$nsttime - $ulPreOffset <= $now} { + if {!$force && $nsttime - $ulPreOffset <= $now} { # Start time in the past if {$nsttime + $nduration + $ulPostOffset >= $now} { # Still showing