diff options
| author | Bond-009 <bond.009@outlook.com> | 2021-08-13 00:33:18 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-08-13 00:33:18 +0200 |
| commit | e5a29824e5126bead4194fff3e9f7d95133c9fb7 (patch) | |
| tree | 679f8fe5926fef2f518567df049703a4092b4acc /Emby.Server.Implementations/Library/LibraryManager.cs | |
| parent | 1f99c9b90c5b791bb41ff711ad20b390f4f2268f (diff) | |
| parent | f83a5bb08eeb503b1ff40507b966af1b266fbaa7 (diff) | |
Merge branch 'master' into minor15
Diffstat (limited to 'Emby.Server.Implementations/Library/LibraryManager.cs')
| -rw-r--r-- | Emby.Server.Implementations/Library/LibraryManager.cs | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/Emby.Server.Implementations/Library/LibraryManager.cs b/Emby.Server.Implementations/Library/LibraryManager.cs index d80637332..13fb8b2fd 100644 --- a/Emby.Server.Implementations/Library/LibraryManager.cs +++ b/Emby.Server.Implementations/Library/LibraryManager.cs @@ -2540,9 +2540,10 @@ namespace Emby.Server.Implementations.Library { episodeInfo = resolver.Resolve(episode.Path, isFolder, null, null, isAbsoluteNaming); // Resolve from parent folder if it's not the Season folder - if (episodeInfo == null && episode.Parent.GetType() == typeof(Folder)) + var parent = episode.GetParent(); + if (episodeInfo == null && parent.GetType() == typeof(Folder)) { - episodeInfo = resolver.Resolve(episode.Parent.Path, true, null, null, isAbsoluteNaming); + episodeInfo = resolver.Resolve(parent.Path, true, null, null, isAbsoluteNaming); if (episodeInfo != null) { // add the container |