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

update video osd

Browse Source
This commit is contained in:
Luke Pulverenti 2017-01-15 16:29:00 -05:00
parent 95ceddb7d9
commit 6e42398f9e
2 changed files with 48 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Emby.Server.Implementations/Dto/DtoService.cs
View File

@ -1512,7 +1512,8 @@ namespace Emby.Server.Implementations.Dto
return artist; return artist;
} }
} }
return item.GetParent();
return item.DisplayParent ?? item.GetParent();
} }
private void AddInheritedImages(BaseItemDto dto, BaseItem item, DtoOptions options, BaseItem owner) private void AddInheritedImages(BaseItemDto dto, BaseItem item, DtoOptions options, BaseItem owner)

8
Mono.Nat/Pmp/PmpNatDevice.cs
View File

@ -135,6 +135,8 @@ namespace Mono.Nat.Pmp
private async void CreatePortMapListen(UdpClient udpClient, Mapping mapping, CancellationToken cancellationToken) private async void CreatePortMapListen(UdpClient udpClient, Mapping mapping, CancellationToken cancellationToken)
{ {
while (!cancellationToken.IsCancellationRequested) while (!cancellationToken.IsCancellationRequested)
{
try
{ {
var result = await udpClient.ReceiveAsync().ConfigureAwait(false); var result = await udpClient.ReceiveAsync().ConfigureAwait(false);
var endPoint = result.RemoteEndPoint; var endPoint = result.RemoteEndPoint;
@ -187,6 +189,12 @@ namespace Mono.Nat.Pmp
mapping.Expiration = DateTime.Now.AddSeconds(lifetime); mapping.Expiration = DateTime.Now.AddSeconds(lifetime);
return; return;
} }
catch (Exception ex)
{
NatUtility.Logger.ErrorException("Error in CreatePortMapListen", ex);
return;
}
}
} }
/// <summary> /// <summary>