lgladsden/jellyfin-server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #2505 from MediaBrowser/dev

Browse Source 
3.2.5.5
This commit is contained in:
Luke 2017-03-03 01:38:28 -05:00 committed by GitHub
commit 50ecda3d18
2 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Emby.Server.Implementations/LiveTv/TunerHosts/HdHomerun/HdHomerunHost.cs
View File

@ -142,9 +142,12 @@ namespace Emby.Server.Implementations.LiveTv.TunerHosts.HdHomerun
{ {
var response = JsonSerializer.DeserializeFromStream<DiscoverResponse>(stream); var response = JsonSerializer.DeserializeFromStream<DiscoverResponse>(stream);
lock (_modelCache) if (!string.IsNullOrWhiteSpace(info.Id))
{ {
_modelCache[info.Id] = response; lock (_modelCache)
{
_modelCache[info.Id] = response;
}
} }
return response; return response;
@ -159,10 +162,13 @@ namespace Emby.Server.Implementations.LiveTv.TunerHosts.HdHomerun
{ {
ModelNumber = defaultValue ModelNumber = defaultValue
}; };
// HDHR4 doesn't have this api if (!string.IsNullOrWhiteSpace(info.Id))
lock (_modelCache)
{ {
_modelCache[info.Id] = response; // HDHR4 doesn't have this api
lock (_modelCache)
{
_modelCache[info.Id] = response;
}
} }
return response; return response;
} }

2
SharedVersion.cs
View File

@ -1,3 +1,3 @@
using System.Reflection; using System.Reflection;
[assembly: AssemblyVersion("3.2.5.4")] [assembly: AssemblyVersion("3.2.5.5")]