update channel streams

9 years ago · a4e73120a7
parent 3d8287bc6e
commit a4e73120a7
2 changed files with 6 additions and 1 deletions
--- a/MediaBrowser.MediaEncoding/Subtitles/SubtitleEncoder.cs
+++ b/MediaBrowser.MediaEncoding/Subtitles/SubtitleEncoder.cs
@ -586,7 +586,7 @@ namespace MediaBrowser.MediaEncoding.Subtitles

            process.StandardError.BaseStream.CopyToAsync(logFileStream);

-            var ranToCompletion = process.WaitForExit(60000);
+            var ranToCompletion = process.WaitForExit(120000);

            if (!ranToCompletion)
            {
--- a/MediaBrowser.Server.Implementations/LiveTv/LiveTvManager.cs
+++ b/MediaBrowser.Server.Implementations/LiveTv/LiveTvManager.cs
@ -364,6 +364,11 @@ namespace MediaBrowser.Server.Implementations.LiveTv
        {
            await _liveStreamSemaphore.WaitAsync(cancellationToken).ConfigureAwait(false);

+            if (string.Equals(id, mediaSourceId, StringComparison.OrdinalIgnoreCase))
+            {
+                mediaSourceId = null;
+            }
+
            try
            {
                MediaSourceInfo info;