[vlc-devel] commit: Fix GoogleImage warning. Close #3311 (Jean-Baptiste Kempf )

[git version control]

vlc | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Mon Feb 22 23:08:47 2010 +0100| [d66b08e0863383ec14c35ecc2556ca80054486a6] | committer: Jean-Baptiste Kempf 

Fix GoogleImage warning. Close #3311

Patch by ale5000

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=d66b08e0863383ec14c35ecc2556ca80054486a6
---

 share/lua/meta/art/10_googleimage.lua |   13 ++++++++-----
 1 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/share/lua/meta/art/10_googleimage.lua b/share/lua/meta/art/10_googleimage.lua
index f42714c..9d00164 100644
--- a/share/lua/meta/art/10_googleimage.lua
+++ b/share/lua/meta/art/10_googleimage.lua
@@ -28,13 +28,16 @@ function get_query( title )
 end
 
 -- Return the artwork
--- This is disabled because we have too much false positive by the inherent
--- nature of this script.
-function fetch_art_disabled()
-    local meta = vlc.item:metas()
+function fetch_art()
+	-- This is disabled because we have too much false positive by the inherent nature of this script.
+	if true then vlc.msg.dbg("10_googleimage.lua is disabled") return nil end
+
+	if vlc.input == nil then return nil end
+	local item = vlc.input.item()
+    local meta = item:metas()
     if meta["artist"] and meta["album"] then
         title = meta["artist"].." "..meta["album"]
-    elseif meta["title"] and meta["artist"] then
+    elseif meta["artist"] and meta["title"] then
         title = meta["artist"].." "..meta["title"]
     elseif meta["title"] then
         title = meta["title"]