diff options
| author | Claus Vium <cvium@users.noreply.github.com> | 2022-10-07 07:50:14 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-10-07 07:50:14 +0200 |
| commit | 9ff918cb142f837bd55e1f87aba3f68f7de295e4 (patch) | |
| tree | 75ad827497aeb9d1dd6af47d97bfe9f6fd13b5c4 /Emby.Server.Implementations | |
| parent | 803972a76f6f8eb590b2de06662f7e83ce40273d (diff) | |
| parent | 87d460909f8019d7701fe39dd6b9b23594a6cffd (diff) | |
Merge pull request #8505 from JJS/CompilerWarnings
Diffstat (limited to 'Emby.Server.Implementations')
| -rw-r--r-- | Emby.Server.Implementations/Data/SynchronousMode.cs (renamed from Emby.Server.Implementations/Data/SynchronouseMode.cs) | 0 | ||||
| -rw-r--r-- | Emby.Server.Implementations/Images/DynamicImageProvider.cs | 1 | ||||
| -rw-r--r-- | Emby.Server.Implementations/Library/LibraryManager.cs | 2 | ||||
| -rw-r--r-- | Emby.Server.Implementations/LiveTv/EmbyTV/RecordingHelper.cs | 4 |
4 files changed, 4 insertions, 3 deletions
diff --git a/Emby.Server.Implementations/Data/SynchronouseMode.cs b/Emby.Server.Implementations/Data/SynchronousMode.cs index cde524e2e..cde524e2e 100644 --- a/Emby.Server.Implementations/Data/SynchronouseMode.cs +++ b/Emby.Server.Implementations/Data/SynchronousMode.cs diff --git a/Emby.Server.Implementations/Images/DynamicImageProvider.cs b/Emby.Server.Implementations/Images/DynamicImageProvider.cs index 9f9a4902a..0faa0f8fa 100644 --- a/Emby.Server.Implementations/Images/DynamicImageProvider.cs +++ b/Emby.Server.Implementations/Images/DynamicImageProvider.cs @@ -93,6 +93,7 @@ namespace Emby.Server.Implementations.Images returnItems.Shuffle(); return returnItems; } + returnItems = items .Where(i => i.HasImage(ImageType.Primary)) .ToList(); diff --git a/Emby.Server.Implementations/Library/LibraryManager.cs b/Emby.Server.Implementations/Library/LibraryManager.cs index 67f9c5765..db1eab1e4 100644 --- a/Emby.Server.Implementations/Library/LibraryManager.cs +++ b/Emby.Server.Implementations/Library/LibraryManager.cs @@ -2779,7 +2779,7 @@ namespace Emby.Server.Implementations.Library } }) .Where(i => i != null) - .Where(i => query.User == null ? + .Where(i => query.User == null ? true : i.IsVisible(query.User)) .ToList(); diff --git a/Emby.Server.Implementations/LiveTv/EmbyTV/RecordingHelper.cs b/Emby.Server.Implementations/LiveTv/EmbyTV/RecordingHelper.cs index 6ad9ccdf6..40dcca94f 100644 --- a/Emby.Server.Implementations/LiveTv/EmbyTV/RecordingHelper.cs +++ b/Emby.Server.Implementations/LiveTv/EmbyTV/RecordingHelper.cs @@ -2,8 +2,8 @@ using System; using System.Globalization; -using MediaBrowser.Controller.LiveTv; using System.Text; +using MediaBrowser.Controller.LiveTv; namespace Emby.Server.Implementations.LiveTv.EmbyTV { @@ -56,7 +56,7 @@ namespace Emby.Server.Implementations.LiveTv.EmbyTV } tmpName += " " + info.EpisodeTitle; - // Since the filename will be used with file ext. (.mp4, .ts, etc) + // Since the filename will be used with file ext. (.mp4, .ts, etc) if (Encoding.UTF8.GetByteCount(tmpName) < 250) { name = tmpName; |