Merge

1 files changed, 7 insertions, 3 deletions

diff --git a/MediaBrowser.Api/HttpHandlers/PluginConfigurationHandler.cs b/MediaBrowser.Api/HttpHandlers/PluginConfigurationHandler.cs
index 0e19aecd5..109440e98 100644
--- a/MediaBrowser.Api/HttpHandlers/PluginConfigurationHandler.cs
+++ b/MediaBrowser.Api/HttpHandlers/PluginConfigurationHandler.cs
@@ -1,5 +1,6 @@
 using System;

 using System.Linq;

+using System.Threading.Tasks;

 using MediaBrowser.Common.Net.Handlers;

 using MediaBrowser.Controller;

 using MediaBrowser.Model.Plugins;

@@ -8,11 +9,14 @@ namespace MediaBrowser.Api.HttpHandlers
 {

     public class PluginConfigurationHandler : BaseJsonHandler<BasePluginConfiguration>

     {

-        protected override BasePluginConfiguration GetObjectToSerialize()

+        protected override Task<BasePluginConfiguration> GetObjectToSerialize()

         {

-            string pluginName = QueryString["name"];

+            return Task.Run(() =>

+            {

+                string pluginName = QueryString["name"];

 

-            return Kernel.Instance.Plugins.First(p => p.Name.Equals(pluginName, StringComparison.OrdinalIgnoreCase)).Configuration;

+                return Kernel.Instance.Plugins.First(p => p.Name.Equals(pluginName, StringComparison.OrdinalIgnoreCase)).Configuration;

+            });

         }

     }

 }