Check if disposed first

This commit is contained in:
Bond-009 2019-03-25 17:27:24 +01:00
parent 5024c52c60
commit fc8de8aead

View File

@ -102,9 +102,10 @@ namespace Emby.Dlna.PlayTo
{ {
_sessionManager.ReportSessionEnded(_session.Id); _sessionManager.ReportSessionEnded(_session.Id);
} }
catch catch (Exception ex)
{ {
// Could throw if the session is already gone // Could throw if the session is already gone
_logger.LogError(ex, "Error reporting the end of session {Id}", _session.Id);
} }
} }
@ -112,20 +113,14 @@ namespace Emby.Dlna.PlayTo
{ {
var info = e.Argument; var info = e.Argument;
info.Headers.TryGetValue("NTS", out string nts); if (!_disposed
&& info.Headers.TryGetValue("USN", out string usn)
if (!info.Headers.TryGetValue("USN", out string usn)) usn = string.Empty; && usn.IndexOf(_device.Properties.UUID, StringComparison.OrdinalIgnoreCase) != -1
&& (usn.IndexOf("MediaRenderer:", StringComparison.OrdinalIgnoreCase) != -1
if (!info.Headers.TryGetValue("NT", out string nt)) nt = string.Empty; || (info.Headers.TryGetValue("NT", out string nt)
&& nt.IndexOf("MediaRenderer:", StringComparison.OrdinalIgnoreCase) != -1)))
if (usn.IndexOf(_device.Properties.UUID, StringComparison.OrdinalIgnoreCase) != -1 &&
!_disposed)
{ {
if (usn.IndexOf("MediaRenderer:", StringComparison.OrdinalIgnoreCase) != -1 || OnDeviceUnavailable();
nt.IndexOf("MediaRenderer:", StringComparison.OrdinalIgnoreCase) != -1)
{
OnDeviceUnavailable();
}
} }
} }