github/Ombi
1
0
Fork 0
mirror of https://github.com/Ombi-app/Ombi.git synced 2025-07-10 23:42:36 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'origin/dev' into dev

Browse source
This commit is contained in:
Drewster727 2016-04-04 09:16:49 -05:00
commit 2ddb949178
2 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
PlexRequests.Api/MusicBrainzApi.cs
View file

@ -82,7 +82,7 @@ namespace PlexRequests.Api
try try
{ {
return Api.Execute<MusicBrainzReleaseInfo>(request, BaseUri); return Api.ExecuteJson<MusicBrainzReleaseInfo>(request, BaseUri);
} }
catch (JsonSerializationException jse) catch (JsonSerializationException jse)
{ {

2
PlexRequests.UI/Modules/SearchModule.cs
View file

@ -516,7 +516,7 @@ namespace PlexRequests.UI.Modules
var artist = albumInfo.ArtistCredits?.FirstOrDefault()?.artist; var artist = albumInfo.ArtistCredits?.FirstOrDefault()?.artist;
if (artist == null) if (artist == null)
{ {
return Response.AsJson("We could not find the artist on MusicBrainz. Please try again later or contact your admin"); return Response.AsJson(new JsonResponseModel {Result = false, Message = "We could not find the artist on MusicBrainz. Please try again later or contact your admin"});
} }
var model = new RequestedModel var model = new RequestedModel