aboutsummaryrefslogtreecommitdiff
path: root/MediaBrowser.Controller
diff options
context:
space:
mode:
authordfederm <david.federman@outlook.com>2026-02-26 13:54:31 -0500
committerBond_009 <bond.009@outlook.com>2026-02-26 13:54:31 -0500
commitbdfb6edfa3bb0ed1b4876edb3c1cf8f42b7486de (patch)
tree511864840f526062472f259ec35b45579b91ce29 /MediaBrowser.Controller
parent25e8c6d5916682967c85175d11286b2d6b412d06 (diff)
Backport pull request #16150 from jellyfin/release-10.11.zHEADmaster
Fix nullref in Season.GetEpisodes when the season is detached from a series Original-merge: b65daeca0baf7a447185205461b4a9d758bbeb26 Merged-by: Bond-009 <bond.009@outlook.com> Backported-by: Bond_009 <bond.009@outlook.com>
Diffstat (limited to 'MediaBrowser.Controller')
-rw-r--r--MediaBrowser.Controller/Entities/TV/Season.cs7
1 files changed, 6 insertions, 1 deletions
diff --git a/MediaBrowser.Controller/Entities/TV/Season.cs b/MediaBrowser.Controller/Entities/TV/Season.cs
index b972ebaa6..4360253b0 100644
--- a/MediaBrowser.Controller/Entities/TV/Season.cs
+++ b/MediaBrowser.Controller/Entities/TV/Season.cs
@@ -201,12 +201,17 @@ namespace MediaBrowser.Controller.Entities.TV
public List<BaseItem> GetEpisodes(Series series, User user, IEnumerable<Episode> allSeriesEpisodes, DtoOptions options, bool shouldIncludeMissingEpisodes)
{
+ if (series is null)
+ {
+ return [];
+ }
+
return series.GetSeasonEpisodes(this, user, allSeriesEpisodes, options, shouldIncludeMissingEpisodes);
}
public List<BaseItem> GetEpisodes()
{
- return Series.GetSeasonEpisodes(this, null, null, new DtoOptions(true), true);
+ return GetEpisodes(Series, null, null, new DtoOptions(true), true);
}
public override List<BaseItem> GetChildren(User user, bool includeLinkedChildren, InternalItemsQuery query)