diff options
| author | Bond-009 <bond.009@outlook.com> | 2020-06-16 11:49:42 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-16 11:49:42 +0200 |
| commit | 4d91060c25662774c6f57941c78fcb73df6fdefa (patch) | |
| tree | 59110387f0253714dd575972c51ed0356fcc5f5b /Emby.Server.Implementations/Library/Resolvers | |
| parent | ebfd1e7c47c62e2aa3d4653af3f6622fc7544d19 (diff) | |
| parent | ab3dece9f1160e6f08be12796a8a952e36213da5 (diff) | |
Merge pull request #3341 from telans/brace-spacing
Add newlines after closing braces (SA1513/SA1516)
Diffstat (limited to 'Emby.Server.Implementations/Library/Resolvers')
| -rw-r--r-- | Emby.Server.Implementations/Library/Resolvers/SpecialFolderResolver.cs | 2 | ||||
| -rw-r--r-- | Emby.Server.Implementations/Library/Resolvers/TV/EpisodeResolver.cs | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/Emby.Server.Implementations/Library/Resolvers/SpecialFolderResolver.cs b/Emby.Server.Implementations/Library/Resolvers/SpecialFolderResolver.cs index 4819f2fc0..99f304190 100644 --- a/Emby.Server.Implementations/Library/Resolvers/SpecialFolderResolver.cs +++ b/Emby.Server.Implementations/Library/Resolvers/SpecialFolderResolver.cs @@ -41,10 +41,12 @@ namespace Emby.Server.Implementations.Library.Resolvers { return new AggregateFolder(); } + if (string.Equals(args.Path, _appPaths.DefaultUserViewsPath, StringComparison.OrdinalIgnoreCase)) { return new UserRootFolder(); // if we got here and still a root - must be user root } + if (args.IsVf) { return new CollectionFolder diff --git a/Emby.Server.Implementations/Library/Resolvers/TV/EpisodeResolver.cs b/Emby.Server.Implementations/Library/Resolvers/TV/EpisodeResolver.cs index 7f477a0f0..2f7af60c0 100644 --- a/Emby.Server.Implementations/Library/Resolvers/TV/EpisodeResolver.cs +++ b/Emby.Server.Implementations/Library/Resolvers/TV/EpisodeResolver.cs @@ -55,6 +55,7 @@ namespace Emby.Server.Implementations.Library.Resolvers.TV episode.SeriesId = series.Id; episode.SeriesName = series.Name; } + if (season != null) { episode.SeasonId = season.Id; |