avoid Take(0) when limit == 0 (#14608)

Co-authored-by: Evan <evan@MacBook-Pro.local>

2 files changed, 5 insertions, 8 deletions

diff --git a/src/Jellyfin.LiveTv/Channels/ChannelManager.cs b/src/Jellyfin.LiveTv/Channels/ChannelManager.cs
index 8ee129a57..2b8e5a0a0 100644
--- a/src/Jellyfin.LiveTv/Channels/ChannelManager.cs
+++ b/src/Jellyfin.LiveTv/Channels/ChannelManager.cs
@@ -240,12 +240,9 @@ namespace Jellyfin.LiveTv.Channels
             var all = channels;
             var totalCount = all.Count;
 
-            if (query.StartIndex.HasValue || query.Limit.HasValue)
-            {
-                int startIndex = query.StartIndex ?? 0;
-                int count = query.Limit is null ? totalCount - startIndex : Math.Min(query.Limit.Value, totalCount - startIndex);
-                all = all.GetRange(startIndex, count);
-            }
+            int startIndex = query.StartIndex ?? 0;
+            int count = (query.Limit ?? 0) > 0 ? Math.Min(query.Limit.Value, totalCount - startIndex) : totalCount - startIndex;
+            all = all.GetRange(query.StartIndex ?? 0, count);
 
             if (query.RefreshLatestChannelItems)
             {
diff --git a/src/Jellyfin.LiveTv/LiveTvManager.cs b/src/Jellyfin.LiveTv/LiveTvManager.cs
index 53bc6751f..1d18ade9d 100644
--- a/src/Jellyfin.LiveTv/LiveTvManager.cs
+++ b/src/Jellyfin.LiveTv/LiveTvManager.cs
@@ -287,7 +287,7 @@ namespace Jellyfin.LiveTv
                 GenreIds = query.GenreIds
             };
 
-            if (query.Limit.HasValue)
+            if (query.Limit.HasValue && query.Limit.Value > 0)
             {
                 internalQuery.Limit = Math.Max(query.Limit.Value * 4, 200);
             }
@@ -305,7 +305,7 @@ namespace Jellyfin.LiveTv
 
             IEnumerable<BaseItem> programs = orderedPrograms;
 
-            if (query.Limit.HasValue)
+            if (query.Limit.HasValue && query.Limit.Value > 0)
             {
                 programs = programs.Take(query.Limit.Value);
             }