From 097ed2d74c40655fcd28131ef81108c0b7477a25 Mon Sep 17 00:00:00 2001 From: hummypkg Date: Mon, 19 Dec 2016 11:05:19 +0000 Subject: [PATCH] fix error with non-ts files git-svn-id: file:///root/webif/svn/pkg/webif/trunk@3439 2a923420-c742-0410-a762-8d5b09965624 --- CONTROL/control | 2 +- webif/html/browse/index.jim | 8 +++++--- webif/lib/queue.class | 2 ++ 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/CONTROL/control b/CONTROL/control index 8e0265e..4e2ff7c 100644 --- a/CONTROL/control +++ b/CONTROL/control @@ -1,7 +1,7 @@ Package: webif Priority: optional Section: web -Version: 1.3.4-3 +Version: 1.3.4-4 Architecture: mipsel Maintainer: af123@hpkg.tv Depends: tcpfix,webif-channelicons(>=1.1.24),lighttpd(>=1.4.39-1),jim(>=0.77),jim-oo(>=0.77),jim-sqlite3(>=0.76),jim-cgi(>=0.7-1),jim-binary(>=0.76),service-control(>=2.3),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),sqlite3(>=3.15.1) diff --git a/webif/html/browse/index.jim b/webif/html/browse/index.jim index 47d3724..bead21f 100755 --- a/webif/html/browse/index.jim +++ b/webif/html/browse/index.jim @@ -217,9 +217,11 @@ proc entry {file} {{i 0}} { } # Queued - set queued [queue status $ts] - if {$queued ne ""} { - icon "/img/queueps.png" "Queued for $queued" + if {$type eq "ts"} { + set queued [queue status $ts] + if {$queued ne ""} { + icon "/img/queueps.png" "Queued for $queued" + } } # Opt+ button diff --git a/webif/lib/queue.class b/webif/lib/queue.class index 3c33348..96b013a 100644 --- a/webif/lib/queue.class +++ b/webif/lib/queue.class @@ -128,6 +128,8 @@ proc {queue delete_by_id} {id} { } proc {queue status} {ts} { + if {$ts eq "0"} { return "" } + set db [queue dbhandle] set ret [$db query {