CERBERUS/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2026-08-03 22:40:09 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

rework server sync

Browse source
This commit is contained in:
Luke Pulverenti 2015-04-13 01:12:02 -04:00
parent 933fca78e6
commit 65fb01bbe2
23 changed files with 162 additions and 105 deletions
Download patch file Download diff file Expand all files Collapse all files

12
MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs
View file

@ -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();
}
}