diff options
| author | Luke Pulverenti <luke.pulverenti@gmail.com> | 2016-02-15 23:54:20 -0500 |
|---|---|---|
| committer | Luke Pulverenti <luke.pulverenti@gmail.com> | 2016-02-15 23:54:20 -0500 |
| commit | 600aa7686586d3cfd9fae05f70456a7b3badc1c9 (patch) | |
| tree | 1d46f68e1bd0224ca8f498f74cffb72203fdeab9 | |
| parent | f95e780a4d7ad217586ffc321d6a69fe3ab7a082 (diff) | |
update recordings
| -rw-r--r-- | MediaBrowser.Api/PluginService.cs | 5 | ||||
| -rw-r--r-- | MediaBrowser.Server.Implementations/LiveTv/EmbyTV/EncodedRecorder.cs | 2 |
2 files changed, 5 insertions, 2 deletions
diff --git a/MediaBrowser.Api/PluginService.cs b/MediaBrowser.Api/PluginService.cs index 2d7444f60..aead73def 100644 --- a/MediaBrowser.Api/PluginService.cs +++ b/MediaBrowser.Api/PluginService.cs @@ -208,7 +208,7 @@ namespace MediaBrowser.Api 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) { @@ -228,8 +228,9 @@ namespace MediaBrowser.Api .ToList(); } } - catch + catch (Exception ex) { + //Logger.ErrorException("Error getting plugin list", ex); // Play it safe here if (requireAppStoreEnabled) { diff --git a/MediaBrowser.Server.Implementations/LiveTv/EmbyTV/EncodedRecorder.cs b/MediaBrowser.Server.Implementations/LiveTv/EmbyTV/EncodedRecorder.cs index b4ff79567..5f4d32732 100644 --- a/MediaBrowser.Server.Implementations/LiveTv/EmbyTV/EncodedRecorder.cs +++ b/MediaBrowser.Server.Implementations/LiveTv/EmbyTV/EncodedRecorder.cs @@ -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 StartStreamingLog(process.StandardError.BaseStream, _logFileStream); + onStarted(); + // Wait for the file to exist before proceeeding while (!_hasExited) { |