Comments and cleanup. ALso updated ffmpeg + ffprobe

1 files changed, 7 insertions, 4 deletions

diff --git a/MediaBrowser.Controller/Providers/FolderProviderFromXml.cs b/MediaBrowser.Controller/Providers/FolderProviderFromXml.cs
index f0c95e4f78..d0bd20a47a 100644
--- a/MediaBrowser.Controller/Providers/FolderProviderFromXml.cs
+++ b/MediaBrowser.Controller/Providers/FolderProviderFromXml.cs
@@ -20,14 +20,17 @@ namespace MediaBrowser.Controller.Providers
             get { return MetadataProviderPriority.First; }

         }

 

-        public override Task FetchAsync(BaseEntity item, ItemResolveEventArgs args)

+        public async override Task FetchAsync(BaseEntity item, ItemResolveEventArgs args)

+        {

+            await Task.Run(() => { Fetch(item, args); }).ConfigureAwait(false);

+        }

+

+        private void Fetch(BaseEntity item, ItemResolveEventArgs args)

         {

             if (args.ContainsFile("folder.xml"))

             {

-                return Task.Run(() => { new FolderXmlParser().Fetch(item as Folder, Path.Combine(args.Path, "folder.xml")); });

+                new BaseItemXmlParser<Folder>().Fetch(item as Folder, Path.Combine(args.Path, "folder.xml"));

             }

-

-            return Task.FromResult<object>(null);

         }

     }

 }