aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuke Pulverenti <luke.pulverenti@gmail.com>2017-09-11 14:50:00 -0400
committerLuke Pulverenti <luke.pulverenti@gmail.com>2017-09-11 14:50:00 -0400
commit95084d6f7d03594b1d4939067609d0065e08d606 (patch)
tree17ce65180b612877dcb27f21c4aace067a3271be
parent335ec27edc49243fa4310ebc1cec414c01dc0ab4 (diff)
update dlna play to device timeout
-rw-r--r--Emby.Dlna/PlayTo/Device.cs2
-rw-r--r--Emby.Dlna/PlayTo/PlayToController.cs18
2 files changed, 2 insertions, 18 deletions
diff --git a/Emby.Dlna/PlayTo/Device.cs b/Emby.Dlna/PlayTo/Device.cs
index 5a63be304..b6b1c0c03 100644
--- a/Emby.Dlna/PlayTo/Device.cs
+++ b/Emby.Dlna/PlayTo/Device.cs
@@ -113,7 +113,7 @@ namespace Emby.Dlna.PlayTo
private int GetInactiveTimerIntervalMs()
{
- return Timeout.Infinite;
+ return 60000;
}
public void Start()
diff --git a/Emby.Dlna/PlayTo/PlayToController.cs b/Emby.Dlna/PlayTo/PlayToController.cs
index e8d7c9127..95b164212 100644
--- a/Emby.Dlna/PlayTo/PlayToController.cs
+++ b/Emby.Dlna/PlayTo/PlayToController.cs
@@ -48,23 +48,7 @@ namespace Emby.Dlna.PlayTo
{
get
{
- var lastDateKnownActivity = _creationTime > _device.DateLastActivity ? _creationTime : _device.DateLastActivity;
-
- if (DateTime.UtcNow >= lastDateKnownActivity.AddSeconds(120))
- {
- try
- {
- // Session is inactive, mark it for Disposal and don't start the elapsed timer.
- _sessionManager.ReportSessionEnded(_session.Id);
- }
- catch (Exception ex)
- {
- _logger.ErrorException("Error in ReportSessionEnded", ex);
- }
- return false;
- }
-
- return _device != null;
+ return !_disposed && _device != null;
}
}