From: Jo-Philipp Wich <jow@openwrt.org>
Date: Mon, 9 Apr 2012 13:12:25 +0000 (+0000)
Subject: applications/luci-minidlna: fix possible nil indexing if album art option is unset... 
X-Git-Tag: 0.11.0~803
X-Git-Url: https://git.archive.openwrt.org/?p=project%2Fluci.git;a=commitdiff_plain;h=cd456ff616e0c2c18afef2753c01b957bd3a66e2;ds=sidebyside

applications/luci-minidlna: fix possible nil indexing if album art option is unset, only show one filename in placeholder
---

diff --git a/applications/luci-minidlna/luasrc/model/cbi/minidlna.lua b/applications/luci-minidlna/luasrc/model/cbi/minidlna.lua
index 7c9f4dee1..41e2826ee 100644
--- a/applications/luci-minidlna/luasrc/model/cbi/minidlna.lua
+++ b/applications/luci-minidlna/luasrc/model/cbi/minidlna.lua
@@ -143,16 +143,23 @@ s:taboption("general", DynamicList, "media_dir", translate("Media directories:")
 o = s:taboption("general", DynamicList, "album_art_names", translate("Album art names:"),
 	translate("This is a list of file names to check for when searching for album art."))
 o.rmempty = true
-o.placeholder = "Cover.jpg/cover.jpg/AlbumArtSmall.jpg/albumartsmall.jpg"
+o.placeholder = "Cover.jpg"
 
 function o.cfgvalue(self, section)
 	local rv = { }
+
 	local val = Value.cfgvalue(self, section)
-	if type(val) == "table" then val = table.concat(val, "/") end
+	if type(val) == "table" then
+		val = table.concat(val, "/")
+	elseif not val then
+		val = ""
+	end
+
 	local file
 	for file in val:gmatch("[^/%s]+") do
 		rv[#rv+1] = file
 	end
+
 	return rv
 end