Cutlery/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2025-07-09 03:04:24 -04:00
Code Issues Packages Projects Releases Wiki Activity

update recordings

Browse Source
This commit is contained in:
Luke Pulverenti 2016-02-15 23:54:20 -05:00
parent f95e780a4d
commit 600aa76865
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
MediaBrowser.Api/PluginService.cs
View File

@ -208,7 +208,7 @@ namespace MediaBrowser.Api
foreach (var plugin in result) foreach (var plugin in result)
{ {
var pkg = packages.FirstOrDefault(i => !string.IsNullOrWhiteSpace(i.guid) && new Guid(plugin.Id).Equals(new Guid(i.guid))); var pkg = packages.FirstOrDefault(i => !string.IsNullOrWhiteSpace(i.guid) && string.Equals(i.guid.Replace("-", string.Empty), plugin.Id.Replace("-", string.Empty), StringComparison.OrdinalIgnoreCase));
if (pkg != null) if (pkg != null)
{ {
@ -228,8 +228,9 @@ namespace MediaBrowser.Api
.ToList(); .ToList();
} }
} }
catch catch (Exception ex)
{ {
//Logger.ErrorException("Error getting plugin list", ex);
// Play it safe here // Play it safe here
if (requireAppStoreEnabled) if (requireAppStoreEnabled)
{ {

2
MediaBrowser.Server.Implementations/LiveTv/EmbyTV/EncodedRecorder.cs
View File

@ -91,6 +91,8 @@ namespace MediaBrowser.Server.Implementations.LiveTv.EmbyTV
// Important - don't await the log task or we won't be able to kill ffmpeg when the user stops playback // Important - don't await the log task or we won't be able to kill ffmpeg when the user stops playback
StartStreamingLog(process.StandardError.BaseStream, _logFileStream); StartStreamingLog(process.StandardError.BaseStream, _logFileStream);
onStarted();
// Wait for the file to exist before proceeeding // Wait for the file to exist before proceeeding
while (!_hasExited) while (!_hasExited)
{ {