Don't throw when livestream file isn't found

This commit is contained in:
cvium
2021-09-10 11:54:26 +02:00
parent 1a5a74d2a9
commit 026a7af0e8
3 changed files with 15 additions and 4 deletions

View File

@@ -602,7 +602,8 @@ namespace Emby.Server.Implementations.Library
public async Task<MediaSourceInfo> GetLiveStreamMediaInfo(string id, CancellationToken cancellationToken)
{
var liveStreamInfo = GetLiveStreamInfo(id);
// TODO probably shouldn't throw here but it is kept for "backwards compatibility"
var liveStreamInfo = GetLiveStreamInfo(id) ?? throw new ResourceNotFoundException();
var mediaSource = liveStreamInfo.MediaSource;
@@ -778,7 +779,8 @@ namespace Emby.Server.Implementations.Library
throw new ArgumentNullException(nameof(id));
}
var info = GetLiveStreamInfo(id);
// TODO probably shouldn't throw here but it is kept for "backwards compatibility"
var info = GetLiveStreamInfo(id) ?? throw new ResourceNotFoundException();
return Task.FromResult(new Tuple<MediaSourceInfo, IDirectStreamProvider>(info.MediaSource, info as IDirectStreamProvider));
}
@@ -794,7 +796,7 @@ namespace Emby.Server.Implementations.Library
return info;
}
throw new ResourceNotFoundException();
return null;
}
public async Task<MediaSourceInfo> GetLiveStream(string id, CancellationToken cancellationToken)