From 84fdeabd6d5f001347e8e327ac6515383d804d83 Mon Sep 17 00:00:00 2001 From: hummypkg Date: Sun, 2 Oct 2016 20:36:14 +0000 Subject: [PATCH] fix size.jim and rsv.class for event skip git-svn-id: file:///root/webif/svn/pkg/webif/trunk@3317 2a923420-c742-0410-a762-8d5b09965624 --- CONTROL/control | 2 +- webif/html/browse/sizes.jim | 1 + webif/lib/rsv.class | 6 +++++- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/CONTROL/control b/CONTROL/control index 3d933c16..7ba77bfc 100644 --- a/CONTROL/control +++ b/CONTROL/control @@ -1,7 +1,7 @@ Package: webif Priority: optional Section: web -Version: 1.3.2-6 +Version: 1.3.2-7 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/html/browse/sizes.jim b/webif/html/browse/sizes.jim index 143e2626..7f0086a0 100755 --- a/webif/html/browse/sizes.jim +++ b/webif/html/browse/sizes.jim @@ -2,6 +2,7 @@ package require cgi source /mod/webif/lib/setup +require escape httpheader "application/json" diff --git a/webif/lib/rsv.class b/webif/lib/rsv.class index d3e9b32d..8172f719 100755 --- a/webif/lib/rsv.class +++ b/webif/lib/rsv.class @@ -318,7 +318,11 @@ rsv method set_skip {event} { if {$event_id eq $usevtid} { # (mis)use some fields to hold the next event which # should be recorded. - set ucVolume "$next_hsvc:$next_event:$next_time" + if {$next_event == -1} { + set ucVolume -1 + } else { + set ucVolume "$next_hsvc:$next_event:$next_time" + } } }