From ef8b02d28543f9e9070c00877070016f032793bc Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Sat, 11 Jan 2014 00:49:18 -0500
Subject: added dvdlib for better dvd runtimes

---
 .../HttpServer/HttpResultFactory.cs                        | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

(limited to 'MediaBrowser.Server.Implementations/HttpServer/HttpResultFactory.cs')

diff --git a/MediaBrowser.Server.Implementations/HttpServer/HttpResultFactory.cs b/MediaBrowser.Server.Implementations/HttpServer/HttpResultFactory.cs
index 798632af7..2419320a5 100644
--- a/MediaBrowser.Server.Implementations/HttpServer/HttpResultFactory.cs
+++ b/MediaBrowser.Server.Implementations/HttpServer/HttpResultFactory.cs
@@ -360,11 +360,19 @@ namespace MediaBrowser.Server.Implementations.HttpServer
 
             var compress = ShouldCompressResponse(requestContext, contentType);
 
-            var hasOptions = GetStaticResult(requestContext, responseHeaders, contentType, factoryFn, compress, isHeadRequest).Result;
+            var hasOptions = GetStaticResult(requestContext, responseHeaders, contentType, factoryFn, compress, isHeadRequest);
 
-            AddResponseHeaders(hasOptions, responseHeaders);
+            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);
 
-            return hasOptions;
+            return options;
         }
 
         /// <summary>
-- 
cgit v1.2.3