Merge branch 'master' of https://github.com/MediaBrowser/MediaBrowser

MediaBrowser.Controller/Providers/MediaInfo/FFProbeVideoInfoProvider.cs

@@ -85,6 +85,11 @@ namespace MediaBrowser.Controller.Providers.MediaInfo
         /// <returns><c>true</c> if XXXX, <c>false</c> otherwise</returns>
         public override bool Supports(BaseItem item)
         {
+            if (item.LocationType != LocationType.FileSystem)
+            {
+                return false;
+            }
+
             var video = item as Video;
 
             if (video != null)

MediaBrowser.Server.Implementations/Providers/ProviderManager.cs

@@ -368,7 +368,7 @@ namespace MediaBrowser.Server.Implementations.Providers
             }
 
             //download and save locally
-            var localPath = ConfigurationManager.Configuration.SaveLocalMeta ?
+            var localPath = (ConfigurationManager.Configuration.SaveLocalMeta && item.MetaLocation != null) ?
                 Path.Combine(item.MetaLocation, targetName) :
                 _remoteImageCache.GetResourcePath(item.GetType().FullName + item.Path.ToLower(), targetName);