Merge branch 'master' of https://github.com/inflatablefriends/lastfm

inflatablefriends · Oct 20, 2014 · 150d50f · 150d50f
2 parents a47d601 + 8f6a0db
commit 150d50f
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/src/IF.Lastfm.Core/Api/Commands/ChartApi/GetTopArtistsCommand.cs b/src/IF.Lastfm.Core/Api/Commands/ChartApi/GetTopArtistsCommand.cs
@@ -30,9 +30,8 @@ public async override Task<PageResponse<LastArtist>> HandleResponse(HttpResponse
             if (LastFm.IsResponseValid(json, out error) && response.IsSuccessStatusCode)
             {
                 var jtoken = JsonConvert.DeserializeObject<JToken>(json).SelectToken("artists");
-                var artistsToken = jtoken.SelectToken("artists");
-                var itemsToken = artistsToken.SelectToken("artist");
-                var pageInfoToken = artistsToken.SelectToken("@attr");
+                var itemsToken = jtoken.SelectToken("artist");
+                var pageInfoToken = jtoken.SelectToken("@attr");
 
                 return PageResponse<LastArtist>.CreateSuccessResponse(itemsToken, pageInfoToken, LastArtist.ParseJToken);
             }

diff --git a/src/IF.Lastfm.Core/Objects/LastAlbum.cs b/src/IF.Lastfm.Core/Objects/LastAlbum.cs
@@ -70,7 +70,8 @@ internal static LastAlbum ParseJToken(JToken token)
             if (tagsToken != null)
             {
                 var tagToken = tagsToken.SelectToken("tag");
-                a.TopTags = tagToken.Children().Select(LastTag.ParseJToken);
+                if (tagToken != null)
+                	a.TopTags = tagToken.Children().Select(LastTag.ParseJToken);
             }
 
             a.ListenerCount = token.Value<int>("listeners");