Skip to content

Commit

Permalink
Return default calculated images in case of PlexContract issues
Browse files Browse the repository at this point in the history
  • Loading branch information
@da3dsoul
da3dsoul committed Sep 8, 2016
1 parent 10f04ab commit 4803ff7
Showing 1 changed file with 9 additions and 9 deletions.
18 changes: 9 additions & 9 deletions JMMServer/PlexAndKodi/CommonImplementation.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -539,11 +539,11 @@ public MediaContainer GetItemsFromGroup(IProvider prov, int userid, string Group
{
v.Type = "show";
v.GenerateKey(prov, userid);

v.Art = Helper.GetRandomFanartFromVideo(v) ?? v.Art;
v.Banner = Helper.GetRandomBannerFromVideo(v) ?? v.Banner;

v.Art = Helper.GetRandomFanartFromVideo(v);
v.Banner = Helper.GetRandomBannerFromVideo(v);

if (nocast) v.Roles = null;
if (nocast) v.Roles = null;
retGroups.Add(prov, v, info);
v.ParentThumb = v.GrandparentThumb = null;
}
Expand All @@ -557,9 +557,9 @@ public MediaContainer GetItemsFromGroup(IProvider prov, int userid, string Group
v.Group = basegrp;
v.Type = "show";
v.GenerateKey(prov, userid);
v.Art = Helper.GetRandomFanartFromVideo(v);
v.Banner = Helper.GetRandomBannerFromVideo(v);
retGroups.Add(prov, v, info);
v.Art = Helper.GetRandomFanartFromVideo(v) ?? v.Art;
v.Banner = Helper.GetRandomBannerFromVideo(v) ?? v.Banner;
retGroups.Add(prov, v, info);
v.ParentThumb = v.GrandparentThumb = null;
}
}
Expand Down Expand Up @@ -1155,8 +1155,8 @@ private MediaContainer GetGroupsOrSubFiltersFromFilter(IProvider prov, int useri
v.Group = grp.GetUserContract(userid);
v.GenerateKey(prov, userid);
v.Type = "show";
v.Art = Helper.GetRandomFanartFromVideo(v);
v.Banner = Helper.GetRandomBannerFromVideo(v);
v.Art = Helper.GetRandomFanartFromVideo(v) ?? v.Art;
v.Banner = Helper.GetRandomBannerFromVideo(v) ?? v.Banner;
if (nocast) v.Roles = null;
order.Add(v.Group, v);
retGroups.Add(prov, v, info);
Expand Down

0 comments on commit 4803ff7

Please sign in to comment.