Use var_Inherit* instead of var_CreateGet*.

[vlc] / src / playlist / fetcher.c

diff --git a/src/playlist/fetcher.c b/src/playlist/fetcher.c
index f227a412d964ae8681299ba5959cf5a4edbc8acf..1551020960b071765e96530d249424554a3929b7 100644 (file)
--- a/src/playlist/fetcher.c
+++ b/src/playlist/fetcher.c
@@ -34,6 +34,7 @@
 #include <vlc_art_finder.h>
 #include <vlc_memory.h>
 #include <vlc_demux.h>
+#include <vlc_modules.h>
 
 #include "art.h"
 #include "fetcher.h"
@@ -234,7 +235,11 @@ static int FindArt( playlist_fetcher_t *p_fetcher, input_item_t *p_item )
         if( p_module )
         {
             module_unneed( p_finder, p_module );
-            i_ret = 1;
+            /* Try immediately if found in cache by download URL */
+            if( !playlist_FindArtInCache( p_item ) )
+                i_ret = 0;
+            else
+                i_ret = 1;
         }
         vlc_object_release( p_finder );
     }
@@ -338,6 +343,7 @@ static void FetchMeta( playlist_fetcher_t *p_fetcher, input_item_t *p_item )
     if( !p_demux_meta )
         return;
 
+    vlc_object_attach( p_demux_meta, p_fetcher->p_playlist );
     p_demux_meta->p_demux = NULL;
     p_demux_meta->p_item = p_item;