diff options
| author | Luke Pulverenti <luke.pulverenti@gmail.com> | 2016-06-20 13:14:01 -0400 |
|---|---|---|
| committer | Luke Pulverenti <luke.pulverenti@gmail.com> | 2016-06-20 13:14:01 -0400 |
| commit | 88e12d1b4ff433c036ece07271475b23866aab4b (patch) | |
| tree | b5f642396bd224ad8ddabcc5b1e19e2428920ffb /MediaBrowser.Api/Sync/SyncService.cs | |
| parent | dd00e5d5f23ff64322c4e494df22931b56d4e120 (diff) | |
| parent | 820bf41e693240cecd7ee75953535cd8ebfa0a59 (diff) | |
Merge branch 'beta' of https://github.com/MediaBrowser/Emby into beta
Diffstat (limited to 'MediaBrowser.Api/Sync/SyncService.cs')
| -rw-r--r-- | MediaBrowser.Api/Sync/SyncService.cs | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/MediaBrowser.Api/Sync/SyncService.cs b/MediaBrowser.Api/Sync/SyncService.cs index dcc5bd54f..a15ce216f 100644 --- a/MediaBrowser.Api/Sync/SyncService.cs +++ b/MediaBrowser.Api/Sync/SyncService.cs @@ -243,7 +243,7 @@ namespace MediaBrowser.Api.Sync await _syncManager.ReportSyncJobItemTransferBeginning(request.Id).ConfigureAwait(false); - return ResultFactory.GetStaticFileResult(Request, new StaticFileResultOptions + return await ResultFactory.GetStaticFileResult(Request, new StaticFileResultOptions { Path = jobItem.OutputPath, OnError = () => @@ -251,7 +251,8 @@ namespace MediaBrowser.Api.Sync var failedTask = _syncManager.ReportSyncJobItemTransferFailed(request.Id); Task.WaitAll(failedTask); } - }); + + }).ConfigureAwait(false); } public async Task<object> Get(GetSyncDialogOptions request) |