diff options
| author | Luke Pulverenti <luke.pulverenti@gmail.com> | 2015-04-13 01:12:02 -0400 |
|---|---|---|
| committer | Luke Pulverenti <luke.pulverenti@gmail.com> | 2015-04-13 01:12:02 -0400 |
| commit | 65fb01bbe2fb95876217d2374a72b175fe235e60 (patch) | |
| tree | 08764db9e11c0ac3bccece1c09fc63017887033a /MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs | |
| parent | 933fca78e65c146b3cf16eefce6410b21e18cdbe (diff) | |
rework server sync
Diffstat (limited to 'MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs')
| -rw-r--r-- | MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs b/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs index 0bf007572..846d54a5f 100644 --- a/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs +++ b/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs @@ -732,7 +732,7 @@ namespace MediaBrowser.MediaEncoding.Encoder if (enableForceKill) { - process.Process .Kill(); + process.Process.Kill(); } } catch (Exception ex) @@ -748,10 +748,14 @@ namespace MediaBrowser.MediaEncoding.Encoder { proceses = _runningProcesses.ToList(); } + _runningProcesses.Clear(); foreach (var process in proceses) { - StopProcess(process, 500, true); + if (!process.HasExited) + { + StopProcess(process, 500, true); + } } } @@ -801,8 +805,8 @@ namespace MediaBrowser.MediaEncoding.Encoder lock (_mediaEncoder._runningProcesses) { _mediaEncoder._runningProcesses.Remove(this); - } - + } + process.Dispose(); } } |
