Merge pull request #1596 from MediaBrowser/dev

Dev

MediaBrowser.Providers/TV/TheTVDB/TvdbSeasonImageProvider.cs

@@ -88,19 +88,22 @@ namespace MediaBrowser.Providers.TV
 
                 var seriesDataPath = await TvdbSeriesProvider.Current.EnsureSeriesInfo(seriesProviderIds, series.GetPreferredMetadataLanguage(), cancellationToken).ConfigureAwait(false);
 
-                var path = Path.Combine(seriesDataPath, "banners.xml");
-
-                try
-                {
-                    return GetImages(path, item.GetPreferredMetadataLanguage(), seasonNumber, cancellationToken);
-                }
-                catch (FileNotFoundException)
+                if (!string.IsNullOrWhiteSpace(seriesDataPath))
                 {
-                    // No tvdb data yet. Don't blow up
-                }
-                catch (DirectoryNotFoundException)
-                {
-                    // No tvdb data yet. Don't blow up
+                    var path = Path.Combine(seriesDataPath, "banners.xml");
+
+                    try
+                    {
+                        return GetImages(path, item.GetPreferredMetadataLanguage(), seasonNumber, cancellationToken);
+                    }
+                    catch (FileNotFoundException)
+                    {
+                        // No tvdb data yet. Don't blow up
+                    }
+                    catch (DirectoryNotFoundException)
+                    {
+                        // No tvdb data yet. Don't blow up
+                    }
                 }
             }
 

MediaBrowser.XbmcMetadata/Parsers/SeriesNfoParser.cs

@@ -46,7 +46,7 @@ namespace MediaBrowser.XbmcMetadata.Parsers
                         }
                         if (!string.IsNullOrWhiteSpace(tvdbId))
                         {
-                            item.SetProviderId(MetadataProviders.Tvcom, tvdbId);
+                            item.SetProviderId(MetadataProviders.Tvdb, tvdbId);
                         }
                         break;
                     }