aboutsummaryrefslogtreecommitdiff
path: root/MediaBrowser.MediaEncoding/Encoder
diff options
context:
space:
mode:
authorLuke <luke.pulverenti@gmail.com>2016-02-21 17:36:54 -0500
committerLuke <luke.pulverenti@gmail.com>2016-02-21 17:36:54 -0500
commit36304972375ec857772ed00b1fd02ee51595b94a (patch)
treeebb9a7f0cb507fb391a563622fdd6bfb496d49ff /MediaBrowser.MediaEncoding/Encoder
parent95366710b798d54477a8ffa95933d21abf35aba0 (diff)
parentc3361458adfd9fcdbf1431de52826f05feaf1d11 (diff)
Merge pull request #1487 from MediaBrowser/dev
Dev
Diffstat (limited to 'MediaBrowser.MediaEncoding/Encoder')
-rw-r--r--MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs8
1 files changed, 7 insertions, 1 deletions
diff --git a/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs b/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs
index ced36f3aa..8d1b4057b 100644
--- a/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs
+++ b/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs
@@ -934,7 +934,13 @@ namespace MediaBrowser.MediaEncoding.Encoder
_mediaEncoder._runningProcesses.Remove(this);
}
- process.Dispose();
+ try
+ {
+ process.Dispose();
+ }
+ catch (Exception ex)
+ {
+ }
}
private bool _disposed;