Merge branch 'master' of https://github.com/MediaBrowser/MediaBrowser

1 files changed, 4 insertions, 12 deletions

diff --git a/MediaBrowser.Server.Implementations/HttpServer/HttpResultFactory.cs b/MediaBrowser.Server.Implementations/HttpServer/HttpResultFactory.cs
index 2419320a5..9359261c5 100644
--- a/MediaBrowser.Server.Implementations/HttpServer/HttpResultFactory.cs
+++ b/MediaBrowser.Server.Implementations/HttpServer/HttpResultFactory.cs
@@ -360,19 +360,11 @@ namespace MediaBrowser.Server.Implementations.HttpServer
 
             var compress = ShouldCompressResponse(requestContext, contentType);
 
-            var hasOptions = GetStaticResult(requestContext, responseHeaders, contentType, factoryFn, compress, isHeadRequest);
+            var hasOptions = GetStaticResult(requestContext, responseHeaders, contentType, factoryFn, compress, isHeadRequest).Result;
 
-            return GetStaticResultTask(hasOptions, responseHeaders);
-        }
-
-        private async Task<object> GetStaticResultTask(Task<IHasOptions> optionsTask,
-            IEnumerable<KeyValuePair<string, string>> responseHeaders)
-        {
-            var options = await optionsTask.ConfigureAwait(false);
-
-            AddResponseHeaders(options, responseHeaders);
+            AddResponseHeaders(hasOptions, responseHeaders);
 
-            return options;
+            return hasOptions;
         }
 
         /// <summary>
@@ -670,4 +662,4 @@ namespace MediaBrowser.Server.Implementations.HttpServer
             throw error;
         }
     }
-}
+}
\ No newline at end of file