Merge pull request #699 from jellyfin/dev

Dev sync

1 files changed, 7 insertions, 11 deletions

diff --git a/Emby.Server.Implementations/Diagnostics/CommonProcess.cs b/Emby.Server.Implementations/Diagnostics/CommonProcess.cs
index d8a798c46..55539eafc 100644
--- a/Emby.Server.Implementations/Diagnostics/CommonProcess.cs
+++ b/Emby.Server.Implementations/Diagnostics/CommonProcess.cs
@@ -105,26 +105,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));