diff --git a/CONTROL/control b/CONTROL/control index a2a003c4..242577d6 100644 --- a/CONTROL/control +++ b/CONTROL/control @@ -1,7 +1,7 @@ Package: webif Priority: optional Section: web -Version: 1.4.5 +Version: 1.4.6 Architecture: mipsel Maintainer: af123@hpkg.tv Depends: tcpfix,webif-channelicons(>=1.1.27),lighttpd(>=1.4.39-1),jim(>=0.78-1),jim-oo(>=0.77),jim-sqlite3(>=0.77),jim-cgi(>=0.7-1),jim-binary(>=0.76),service-control(>=2.3),busybox(>=1.20.2-1),lsof(>=4.87),epg(>=1.2.8),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.12-1),webif-charts(>=1.2-1),stripts(>=1.4.2),tmenu(>=1.21-2),ffmpeg(>=2.8),id3v2,multienv(>=1.6),tcpping(>=1.1),e2fsprogs,wireless-tools(>=29-1),dbupdate,recmon(>=2.0.7),hwctl,nugget(>=0.98),sqlite3(>=3.15.1),jim-xconv diff --git a/webif/html/browse/crop/crop.jim b/webif/html/browse/crop/crop.jim index 232b8cba..24fb180a 100755 --- a/webif/html/browse/crop/crop.jim +++ b/webif/html/browse/crop/crop.jim @@ -120,7 +120,7 @@ puts " diff --git a/webif/html/browse/crop/execute.jim b/webif/html/browse/crop/execute.jim index 3fd5d353..bca7d78d 100755 --- a/webif/html/browse/crop/execute.jim +++ b/webif/html/browse/crop/execute.jim @@ -14,7 +14,7 @@ if {[system inuse $rfile]} { exit } -set ts [ts fetch $rfile] +set ts [ts fetch_or_error $rfile] set dir [file dirname $rfile] set len [$ts duration 1] diff --git a/webif/lib/ts.class b/webif/lib/ts.class index dbad4548..34087cf2 100644 --- a/webif/lib/ts.class +++ b/webif/lib/ts.class @@ -243,6 +243,14 @@ ts method fileset {} { return $fset } +proc {ts fetch_or_error} {file {checked 0}} { + if {[catch {set ts [ts fetch $file $checked]}] || $ts == 0} { + print "Could not load ts file $file" + return 0 + } + return $ts +} + proc {ts fetch} {file {checked 0}} { # Check that this is a .ts file which has at least one sidecar # file (.hmt)