Merge pull request #3055 from MediaBrowser/beta

Beta

1 files changed, 5 insertions, 3 deletions

diff --git a/MediaBrowser.Controller/Net/BasePeriodicWebSocketListener.cs b/MediaBrowser.Controller/Net/BasePeriodicWebSocketListener.cs
index 6be94e7e6..17b82b3ca 100644
--- a/MediaBrowser.Controller/Net/BasePeriodicWebSocketListener.cs
+++ b/MediaBrowser.Controller/Net/BasePeriodicWebSocketListener.cs
@@ -36,7 +36,7 @@ namespace MediaBrowser.Controller.Net
         /// </summary>
         /// <param name="state">The state.</param>
         /// <returns>Task{`1}.</returns>
-        protected abstract Task<TReturnDataType> GetDataToSend(TStateType state);
+        protected abstract Task<TReturnDataType> GetDataToSend(TStateType state, CancellationToken cancellationToken);
 
         /// <summary>
         /// The logger
@@ -209,7 +209,9 @@ namespace MediaBrowser.Controller.Net
             {
                 var state = tuple.Item4;
 
-                var data = await GetDataToSend(state).ConfigureAwait(false);
+                var cancellationToken = tuple.Item2.Token;
+
+                var data = await GetDataToSend(state, cancellationToken).ConfigureAwait(false);
 
                 if (data != null)
                 {
@@ -218,7 +220,7 @@ namespace MediaBrowser.Controller.Net
                         MessageType = Name,
                         Data = data
 
-                    }, tuple.Item2.Token).ConfigureAwait(false);
+                    }, cancellationToken).ConfigureAwait(false);
 
                     state.DateLastSendUtc = DateTime.UtcNow;
                 }