From 0b80902cc81755f7fc80f20a36872882aa202410 Mon Sep 17 00:00:00 2001
From: Tthecreator <tpo.saedt@student.han.nl>
Date: Tue, 22 Jan 2019 16:52:26 +0100
Subject: Set EnableRaisingEvents correctly for SubtitleEncoder

---
 .../Diagnostics/CommonProcess.cs                        | 17 +++++++----------
 MediaBrowser.MediaEncoding/Subtitles/SubtitleEncoder.cs |  4 ++--
 2 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/Emby.Server.Implementations/Diagnostics/CommonProcess.cs b/Emby.Server.Implementations/Diagnostics/CommonProcess.cs
index d8a798c460..2fa762c319 100644
--- a/Emby.Server.Implementations/Diagnostics/CommonProcess.cs
+++ b/Emby.Server.Implementations/Diagnostics/CommonProcess.cs
@@ -106,25 +106,22 @@ namespace Emby.Server.Implementations.Diagnostics
             return _process.WaitForExit(timeMs);
         }
 
+        
         public Task<bool> WaitForExitAsync(int timeMs)
         {
-            //if (_process.WaitForExit(100))
-            //{
-            //    return Task.FromResult(true);
-            //}
+            //Note: For this function to work correctly, the option EnableRisingEvents needs to be set to true.
+
+            if (HasExited)
+            {
+                return Task.FromResult(true);
+            }
 
-            //timeMs -= 100;
             timeMs = Math.Max(0, timeMs);
 
             var tcs = new TaskCompletionSource<bool>();
 
             var cancellationToken = new CancellationTokenSource(timeMs).Token;
 
-            if (HasExited)
-            {
-                return Task.FromResult(true);
-            }
-
             _process.Exited += (sender, args) => tcs.TrySetResult(true);
 
             cancellationToken.Register(() => tcs.TrySetResult(HasExited));
diff --git a/MediaBrowser.MediaEncoding/Subtitles/SubtitleEncoder.cs b/MediaBrowser.MediaEncoding/Subtitles/SubtitleEncoder.cs
index 59a6244335..2f9eb98eae 100644
--- a/MediaBrowser.MediaEncoding/Subtitles/SubtitleEncoder.cs
+++ b/MediaBrowser.MediaEncoding/Subtitles/SubtitleEncoder.cs
@@ -437,7 +437,7 @@ namespace MediaBrowser.MediaEncoding.Subtitles
                 UseShellExecute = false,
                 FileName = _mediaEncoder.EncoderPath,
                 Arguments = string.Format("{0} -i \"{1}\" -c:s srt \"{2}\"", encodingParam, inputPath, outputPath),
-
+                EnableRaisingEvents = true,
                 IsHidden = true,
                 ErrorDialog = false
             });
@@ -574,7 +574,7 @@ namespace MediaBrowser.MediaEncoding.Subtitles
             {
                 CreateNoWindow = true,
                 UseShellExecute = false,
-
+                EnableRaisingEvents = true,
                 FileName = _mediaEncoder.EncoderPath,
                 Arguments = processArgs,
                 IsHidden = true,
-- 
cgit v1.2.3


From cce90d2b56821ca24d65d4851645c0337cb8e88a Mon Sep 17 00:00:00 2001
From: Tthecreator <tpo.saedt@student.han.nl>
Date: Tue, 22 Jan 2019 19:42:58 +0100
Subject: removed excess newlines

---
 Emby.Server.Implementations/Diagnostics/CommonProcess.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/Emby.Server.Implementations/Diagnostics/CommonProcess.cs b/Emby.Server.Implementations/Diagnostics/CommonProcess.cs
index 2fa762c319..55539eafcf 100644
--- a/Emby.Server.Implementations/Diagnostics/CommonProcess.cs
+++ b/Emby.Server.Implementations/Diagnostics/CommonProcess.cs
@@ -105,7 +105,6 @@ namespace Emby.Server.Implementations.Diagnostics
         {
             return _process.WaitForExit(timeMs);
         }
-
         
         public Task<bool> WaitForExitAsync(int timeMs)
         {
-- 
cgit v1.2.3