From debb7c0da817ef7c243d345dbaecc673cb55e378 Mon Sep 17 00:00:00 2001 From: hummypkg Date: Sun, 29 Nov 2015 22:49:49 +0000 Subject: [PATCH] fix channel change + no DLNA server running message git-svn-id: file:///root/webif/svn/pkg/webif/trunk@2555 2a923420-c742-0410-a762-8d5b09965624 --- CONTROL/control | 2 +- webif/html/browse/index.jim | 9 ++++++++- webif/html/epg/list.jim | 2 +- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/CONTROL/control b/CONTROL/control index 6f11a64..a1719b4 100644 --- a/CONTROL/control +++ b/CONTROL/control @@ -1,7 +1,7 @@ Package: webif Priority: optional Section: web -Version: 1.2.5-10 +Version: 1.2.5-11 Architecture: mipsel Maintainer: af123@hummypkg.org.uk Depends: webif-channelicons(>=1.1.18),lighttpd(>=1.4.37-2),jim(>=0.76),jim-oo,jim-sqlite3(>=0.76),jim-cgi(>=0.7),jim-binary(>=0.76),service-control(>=2.1),busybox(>=1.20.2-1),lsof(>=4.87),epg(>=1.2.0),hmt(>=2.0.8),ssmtp,anacron,trm(>=1.1),openssl-command,nicesplice,id3v2,file,rsvsync(>=1.0.2),webif-charts(>=1.2-1),stripts(>=1.2.5-3),smartmontools,tmenu(>=1.08),ffmpeg,id3v2,multienv(>=1.6),tcpping(>=1.1),e2fsprogs,wireless-tools(>=29-1),dbupdate,recmon(>=2.0.7) diff --git a/webif/html/browse/index.jim b/webif/html/browse/index.jim index 725f10a..e57d560 100755 --- a/webif/html/browse/index.jim +++ b/webif/html/browse/index.jim @@ -233,13 +233,20 @@ proc entry {file} {{i 0}} { source assets.jim if {[system has tvdb]} { source tvdb/assets.jim } -if {!$dlnaok && ![system instandby]} { +if {[system model] eq "HDR" && ![system param DMS_START_ON]} { puts { Note: Content Sharing is disabled on this system. } } +# elseif {!$dlnaok && ![system instandby]} { +# puts { +# +# Note: Content Sharing not yet active on this system. +# +# } +#} puts " $dir diff --git a/webif/html/epg/list.jim b/webif/html/epg/list.jim index 63fb896..14e4d9e 100755 --- a/webif/html/epg/list.jim +++ b/webif/html/epg/list.jim @@ -37,7 +37,7 @@ if {$::qepg} { set got [clock milliseconds] if {[$s chanchangenc]} { - jscss /js/chanchangeenc.js + jscss /js/chanchangenc.js } else { jqplugin confirmAction jscss /js/chanchange.js