diff options
| author | LukePulverenti <luke.pulverenti@gmail.com> | 2013-03-09 20:18:37 -0500 |
|---|---|---|
| committer | LukePulverenti <luke.pulverenti@gmail.com> | 2013-03-09 20:18:37 -0500 |
| commit | 913cb3c564e58dd440dbf3af81f38aad68c1ac2a (patch) | |
| tree | 037f1197a71e975af509b9d951f836b12485b8f3 | |
| parent | 937e434ab6f32ef4444066a9f84bfbea23538432 (diff) | |
| parent | 6ebab4a965e2b79599c784d767edff395858845b (diff) | |
Merge branch 'master' of https://github.com/MediaBrowser/MediaBrowser
| -rw-r--r-- | MediaBrowser.Controller/Providers/MediaInfo/FFProbeVideoInfoProvider.cs | 5 | ||||
| -rw-r--r-- | MediaBrowser.Server.Implementations/Providers/ProviderManager.cs | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/MediaBrowser.Controller/Providers/MediaInfo/FFProbeVideoInfoProvider.cs b/MediaBrowser.Controller/Providers/MediaInfo/FFProbeVideoInfoProvider.cs index 72d210043..06692b2bc 100644 --- a/MediaBrowser.Controller/Providers/MediaInfo/FFProbeVideoInfoProvider.cs +++ b/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) diff --git a/MediaBrowser.Server.Implementations/Providers/ProviderManager.cs b/MediaBrowser.Server.Implementations/Providers/ProviderManager.cs index 5accc06d7..a8239deb4 100644 --- a/MediaBrowser.Server.Implementations/Providers/ProviderManager.cs +++ b/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); |