alteropen/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2026-04-11 21:02:10 +01:00
Code Issues Actions 7 Packages Projects Releases Wiki Activity

Merge pull request #4730 from crobibero/base-item-dto-guid-nullable

Browse Source 
Don't serialize empty GUID to null

(cherry picked from commit b6ecaccf92)
Signed-off-by: Joshua M. Boniface <joshua@boniface.me>
This commit is contained in:
Claus Vium
2020-12-08 18:22:18 +01:00
committed by Joshua M. Boniface
parent 11a37884f0
commit aae90a8480
4 changed files with 11 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Emby.Server.Implementations/LiveTv/LiveTvManager.cs
View File

@@ -1928,7 +1928,7 @@ namespace Emby.Server.Implementations.LiveTv
foreach (var programDto in currentProgramDtos)
{
if (currentChannelsDict.TryGetValue(programDto.ChannelId, out BaseItemDto channelDto))
if (programDto.ChannelId.HasValue && currentChannelsDict.TryGetValue(programDto.ChannelId.Value, out BaseItemDto channelDto))
{
channelDto.CurrentProgram = programDto;
}
@@ -2018,7 +2018,7 @@ namespace Emby.Server.Implementations.LiveTv
info.DayPattern = _tvDtoService.GetDayPattern(info.Days);
info.Name = program.Name;
info.ChannelId = programDto.ChannelId;
info.ChannelId = programDto.ChannelId ?? Guid.Empty;
info.ChannelName = programDto.ChannelName;
info.StartDate = program.StartDate;
info.Name = program.Name;