cotugno/jellyfin
2
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2024-11-16 02:18:54 -07:00
Code Issues Packages Projects Releases Wiki Activity

update channel streams

Browse Source
This commit is contained in:
Luke Pulverenti 2015-09-01 18:04:54 -04:00
parent 3d8287bc6e
commit a4e73120a7
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
MediaBrowser.MediaEncoding/Subtitles/SubtitleEncoder.cs
View File

@ -586,7 +586,7 @@ namespace MediaBrowser.MediaEncoding.Subtitles
process.StandardError.BaseStream.CopyToAsync(logFileStream); process.StandardError.BaseStream.CopyToAsync(logFileStream);
var ranToCompletion = process.WaitForExit(60000); var ranToCompletion = process.WaitForExit(120000);
if (!ranToCompletion) if (!ranToCompletion)
{ {

5
MediaBrowser.Server.Implementations/LiveTv/LiveTvManager.cs
View File

@ -364,6 +364,11 @@ namespace MediaBrowser.Server.Implementations.LiveTv
{ {
await _liveStreamSemaphore.WaitAsync(cancellationToken).ConfigureAwait(false); await _liveStreamSemaphore.WaitAsync(cancellationToken).ConfigureAwait(false);
if (string.Equals(id, mediaSourceId, StringComparison.OrdinalIgnoreCase))
{
mediaSourceId = null;
}
try try
{ {
MediaSourceInfo info; MediaSourceInfo info;