diff options
| author | crobibero <cody@robibe.ro> | 2020-08-23 07:53:33 -0600 |
|---|---|---|
| committer | crobibero <cody@robibe.ro> | 2020-08-23 07:53:33 -0600 |
| commit | cb44f16068bb66db7e35e473530c0a85583c2511 (patch) | |
| tree | 0f41bf313fded94e3da067faa84ddffee505613d /Jellyfin.Api/Controllers/MediaInfoController.cs | |
| parent | 4a64819277b98ac98ba0051c49fcf0cbfe16319c (diff) | |
| parent | f9bb79285b672e63054b4ab1b49b744606851c34 (diff) | |
Merge remote-tracking branch 'upstream/master' into output-formatters
Diffstat (limited to 'Jellyfin.Api/Controllers/MediaInfoController.cs')
| -rw-r--r-- | Jellyfin.Api/Controllers/MediaInfoController.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Jellyfin.Api/Controllers/MediaInfoController.cs b/Jellyfin.Api/Controllers/MediaInfoController.cs index 7faf479a5..1e154a039 100644 --- a/Jellyfin.Api/Controllers/MediaInfoController.cs +++ b/Jellyfin.Api/Controllers/MediaInfoController.cs @@ -269,9 +269,9 @@ namespace Jellyfin.Api.Controllers /// <returns>A <see cref="NoContentResult"/> indicating success.</returns> [HttpPost("LiveStreams/Close")] [ProducesResponseType(StatusCodes.Status204NoContent)] - public ActionResult CloseLiveStream([FromQuery, Required] string? liveStreamId) + public async Task<ActionResult> CloseLiveStream([FromQuery, Required] string? liveStreamId) { - _mediaSourceManager.CloseLiveStream(liveStreamId).GetAwaiter().GetResult(); + await _mediaSourceManager.CloseLiveStream(liveStreamId).ConfigureAwait(false); return NoContent(); } |