From 33014f77aaacb91cfbd820052f1a49af66a214e3 Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Fri, 26 May 2017 02:48:54 -0400
Subject: update GetItems method

---
 MediaBrowser.MediaEncoding/Subtitles/SubtitleEncoder.cs | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'MediaBrowser.MediaEncoding/Subtitles/SubtitleEncoder.cs')

diff --git a/MediaBrowser.MediaEncoding/Subtitles/SubtitleEncoder.cs b/MediaBrowser.MediaEncoding/Subtitles/SubtitleEncoder.cs
index 1e983ca15..f8f95684d 100644
--- a/MediaBrowser.MediaEncoding/Subtitles/SubtitleEncoder.cs
+++ b/MediaBrowser.MediaEncoding/Subtitles/SubtitleEncoder.cs
@@ -61,7 +61,7 @@ namespace MediaBrowser.MediaEncoding.Subtitles
             }
         }
 
-        private async Task<Stream> ConvertSubtitles(Stream stream,
+        private Stream ConvertSubtitles(Stream stream,
             string inputFormat,
             string outputFormat,
             long startTimeTicks,
@@ -166,7 +166,7 @@ namespace MediaBrowser.MediaEncoding.Subtitles
 
             using (var stream = subtitle.Item1)
             {
-                return await ConvertSubtitles(stream, inputFormat, outputFormat, startTimeTicks, endTimeTicks, preserveOriginalTimestamps, cancellationToken).ConfigureAwait(false);
+                return  ConvertSubtitles(stream, inputFormat, outputFormat, startTimeTicks, endTimeTicks, preserveOriginalTimestamps, cancellationToken);
             }
         }
 
@@ -445,7 +445,7 @@ namespace MediaBrowser.MediaEncoding.Subtitles
                 throw;
             }
 
-            var ranToCompletion = process.WaitForExit(60000);
+            var ranToCompletion = await process.WaitForExitAsync(300000).ConfigureAwait(false);
 
             if (!ranToCompletion)
             {
@@ -575,7 +575,7 @@ namespace MediaBrowser.MediaEncoding.Subtitles
                 throw;
             }
 
-            var ranToCompletion = process.WaitForExit(300000);
+            var ranToCompletion = await process.WaitForExitAsync(300000).ConfigureAwait(false);
 
             if (!ranToCompletion)
             {
-- 
cgit v1.2.3