Improvements to session continuation

LazyTarget · Jun 21, 2015 · 143c7bc · 143c7bc
1 parent 732ae46
commit 143c7bc
Showing 1 changed file with 11 additions and 7 deletions.
diff --git a/PollingEngine/Implementations/XbmcPoller/XbmcPoller.cs b/PollingEngine/Implementations/XbmcPoller/XbmcPoller.cs
@@ -285,13 +285,14 @@ public async Task OnInterval(PollingContext context)
 
             //await GetPlaybackInfo();
 
-
-            var lastVideo = _sessionInfo.ActiveVideo != null ? _sessionInfo.ActiveVideo.Video : null;
+
+            var activeVideo = _sessionInfo.ActiveVideo;
+            var lastVideo = activeVideo != null ? activeVideo.Video : null;
 
             DiffType diffType;
             if (videoItemInfo != null)
             {
-                if (lastVideo == null)
+                if (lastVideo == null || (activeVideo != null && !activeVideo.Active))
                 {
                     // Started watching
                     isDiff = true;
@@ -370,7 +371,7 @@ public async Task OnInterval(PollingContext context)
             }
             else
             {
-                if (lastVideo == null)
+                if (lastVideo == null || (activeVideo != null && !activeVideo.Active))
                 {
                     // no diff
                     isDiff = false;
@@ -399,9 +400,12 @@ public async Task OnInterval(PollingContext context)
                     }
 
                     // Set the active video
-                    _sessionInfo.ActiveVideo.Active = false;
-                    _sessionInfo.ActiveVideo.EndTime = time;
-                    await StoreSessionVideo(_sessionInfo.ActiveVideo);
+                    if (_sessionInfo.ActiveVideo.Active)
+                    {
+                        _sessionInfo.ActiveVideo.Active = false;
+                        _sessionInfo.ActiveVideo.EndTime = time;
+                        await StoreSessionVideo(_sessionInfo.ActiveVideo);
+                    }
                     _sessionInfo.ActiveVideo = null;
                 }
             }