diff options
| author | crobibero <cody@robibe.ro> | 2020-08-31 10:32:28 -0600 |
|---|---|---|
| committer | crobibero <cody@robibe.ro> | 2020-08-31 10:32:28 -0600 |
| commit | 95402df88408b96300e627b9962d0e4db2e4c7c5 (patch) | |
| tree | 91cc4d6c271e99256a39f3cacbe1a49bb40ef71a /Jellyfin.Api/Controllers/MediaInfoController.cs | |
| parent | e48df7da5e3d3eb81f68e71c0fe27a64063f00ac (diff) | |
| parent | 95142643f6c98fe4380c63ba9b3055fd3a637466 (diff) | |
Merge remote-tracking branch 'upstream/master' into default-http-client
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(); } |