From 5dc24050683d76d788f65f9ad551a871ee613e98 Mon Sep 17 00:00:00 2001
From: HummyPkg <af123@hummypkg.org.uk>
Date: Fri, 31 Mar 2017 01:36:43 +0100
Subject: [PATCH] defer decryption instead of failing it if DLNA helper is not
 immediately available (DLNA database may be locked)

---
 CONTROL/control                          | 2 +-
 webif/lib/auto/plugin/decrypt/queue.hook | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/CONTROL/control b/CONTROL/control
index 95d376e..b553c70 100644
--- a/CONTROL/control
+++ b/CONTROL/control
@@ -1,7 +1,7 @@
 Package: webif
 Priority: optional
 Section: web
-Version: 1.4.1-4
+Version: 1.4.1-5
 Architecture: mipsel
 Maintainer: af123@hpkg.tv
 Depends: tcpfix,webif-channelicons(>=1.1.25),lighttpd(>=1.4.39-1),jim(>=0.77),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.6),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.10),webif-charts(>=1.2-1),stripts(>=1.2.5-3),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.95),sqlite3(>=3.15.1),jim-xconv
diff --git a/webif/lib/auto/plugin/decrypt/queue.hook b/webif/lib/auto/plugin/decrypt/queue.hook
index 99dac0a..765f5ac 100644
--- a/webif/lib/auto/plugin/decrypt/queue.hook
+++ b/webif/lib/auto/plugin/decrypt/queue.hook
@@ -77,7 +77,7 @@ proc ::decrypt::dequeue {q ts} {
 		    lassign [system dlnahelper [file normalize $file]] url
 		    } msg]} {
 			log "  $file - $msg"
-			return [list "FAILED" $msg]
+			return [list "DEFER" $msg]
 		}
 		if {$url eq ""} {
 			return {"DEFER" "DLNA helper failed"}