aboutsummaryrefslogtreecommitdiff
path: root/Emby.Server.Implementations
diff options
context:
space:
mode:
authorMark Monteiro <marknr.monteiro@protonmail.com>2020-03-27 00:49:22 +0100
committerMark Monteiro <marknr.monteiro@protonmail.com>2020-03-27 00:49:22 +0100
commit7447ea89609fe79be3c5d282a23fc6d7d2bddd66 (patch)
treeb9f9510aea176e678de31a3c78d8a3aeaf4fa81d /Emby.Server.Implementations
parentb947d98266371de7c9fd081e2038f53b3c67e859 (diff)
Make sure Process objects are all disposed correctly
Diffstat (limited to 'Emby.Server.Implementations')
-rw-r--r--Emby.Server.Implementations/LiveTv/EmbyTV/EncodedRecorder.cs13
1 files changed, 10 insertions, 3 deletions
diff --git a/Emby.Server.Implementations/LiveTv/EmbyTV/EncodedRecorder.cs b/Emby.Server.Implementations/LiveTv/EmbyTV/EncodedRecorder.cs
index 55d1f810b..46fb47b7b 100644
--- a/Emby.Server.Implementations/LiveTv/EmbyTV/EncodedRecorder.cs
+++ b/Emby.Server.Implementations/LiveTv/EmbyTV/EncodedRecorder.cs
@@ -290,9 +290,11 @@ namespace Emby.Server.Implementations.LiveTv.EmbyTV
/// </summary>
private void OnFfMpegProcessExited(Process process, string inputFile)
{
- _hasExited = true;
+ try
+ {
+ _hasExited = true;
- _logFileStream?.Dispose();
+ _logFileStream?.Dispose();
_logFileStream = null;
var exitCode = process.ExitCode;
@@ -311,7 +313,12 @@ namespace Emby.Server.Implementations.LiveTv.EmbyTV
CultureInfo.InvariantCulture,
"Recording for {0} failed. Exit code {1}",
_targetPath,
- exitCode)));
+ exitCode)));
+ }
+ }
+ finally
+ {
+ process.Dispose();
}
}