1 files changed, 15 insertions, 17 deletions

diff --git a/MediaBrowser.Api/UserLibrary/PlaystateService.cs b/MediaBrowser.Api/UserLibrary/PlaystateService.cs
index 76f91e373..b40a92a7c 100644
--- a/MediaBrowser.Api/UserLibrary/PlaystateService.cs
+++ b/MediaBrowser.Api/UserLibrary/PlaystateService.cs
@@ -247,14 +247,14 @@ namespace MediaBrowser.Api.UserLibrary
         /// Posts the specified request.
         /// </summary>
         /// <param name="request">The request.</param>
-        public async Task<object> Post(MarkPlayedItem request)
+        public object Post(MarkPlayedItem request)
         {
-            var result = await MarkPlayed(request).ConfigureAwait(false);
+            var result = MarkPlayed(request);
 
             return ToOptimizedResult(result);
         }
 
-        private async Task<UserItemDataDto> MarkPlayed(MarkPlayedItem request)
+        private UserItemDataDto MarkPlayed(MarkPlayedItem request)
         {
             var user = _userManager.GetUserById(request.UserId);
 
@@ -267,13 +267,13 @@ namespace MediaBrowser.Api.UserLibrary
 
             var session = GetSession(_sessionContext);
 
-            var dto = await UpdatePlayedStatus(user, request.Id, true, datePlayed).ConfigureAwait(false);
+            var dto = UpdatePlayedStatus(user, request.Id, true, datePlayed);
 
             foreach (var additionalUserInfo in session.AdditionalUsers)
             {
                 var additionalUser = _userManager.GetUserById(additionalUserInfo.UserId);
 
-                await UpdatePlayedStatus(additionalUser, request.Id, true, datePlayed).ConfigureAwait(false);
+                UpdatePlayedStatus(additionalUser, request.Id, true, datePlayed);
             }
 
             return dto;
@@ -366,9 +366,9 @@ namespace MediaBrowser.Api.UserLibrary
         /// Posts the specified request.
         /// </summary>
         /// <param name="request">The request.</param>
-        public void Delete(OnPlaybackStopped request)
+        public Task Delete(OnPlaybackStopped request)
         {
-            Post(new ReportPlaybackStopped
+            return Post(new ReportPlaybackStopped
             {
                 ItemId = new Guid(request.Id),
                 PositionTicks = request.PositionTicks,
@@ -379,20 +379,18 @@ namespace MediaBrowser.Api.UserLibrary
             });
         }
 
-        public void Post(ReportPlaybackStopped request)
+        public async Task Post(ReportPlaybackStopped request)
         {
             Logger.LogDebug("ReportPlaybackStopped PlaySessionId: {0}", request.PlaySessionId ?? string.Empty);
 
             if (!string.IsNullOrWhiteSpace(request.PlaySessionId))
             {
-                ApiEntryPoint.Instance.KillTranscodingJobs(_authContext.GetAuthorizationInfo(Request).DeviceId, request.PlaySessionId, s => true);
+                await ApiEntryPoint.Instance.KillTranscodingJobs(_authContext.GetAuthorizationInfo(Request).DeviceId, request.PlaySessionId, s => true);
             }
 
             request.SessionId = GetSession(_sessionContext).Id;
 
-            var task = _sessionManager.OnPlaybackStopped(request);
-
-            Task.WaitAll(task);
+            await _sessionManager.OnPlaybackStopped(request);
         }
 
         /// <summary>
@@ -403,22 +401,22 @@ namespace MediaBrowser.Api.UserLibrary
         {
             var task = MarkUnplayed(request);
 
-            return ToOptimizedResult(task.Result);
+            return ToOptimizedResult(task);
         }
 
-        private async Task<UserItemDataDto> MarkUnplayed(MarkUnplayedItem request)
+        private UserItemDataDto MarkUnplayed(MarkUnplayedItem request)
         {
             var user = _userManager.GetUserById(request.UserId);
 
             var session = GetSession(_sessionContext);
 
-            var dto = await UpdatePlayedStatus(user, request.Id, false, null).ConfigureAwait(false);
+            var dto = UpdatePlayedStatus(user, request.Id, false, null);
 
             foreach (var additionalUserInfo in session.AdditionalUsers)
             {
                 var additionalUser = _userManager.GetUserById(additionalUserInfo.UserId);
 
-                await UpdatePlayedStatus(additionalUser, request.Id, false, null).ConfigureAwait(false);
+                UpdatePlayedStatus(additionalUser, request.Id, false, null);
             }
 
             return dto;
@@ -432,7 +430,7 @@ namespace MediaBrowser.Api.UserLibrary
         /// <param name="wasPlayed">if set to <c>true</c> [was played].</param>
         /// <param name="datePlayed">The date played.</param>
         /// <returns>Task.</returns>
-        private async Task<UserItemDataDto> UpdatePlayedStatus(User user, string itemId, bool wasPlayed, DateTime? datePlayed)
+        private UserItemDataDto UpdatePlayedStatus(User user, string itemId, bool wasPlayed, DateTime? datePlayed)
         {
             var item = _libraryManager.GetItemById(itemId);