From f0da58a997ed01635225ae5290d7f34997b99452 Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Mon, 30 Jun 2014 09:28:38 -0400
Subject: fix config startup

---
 MediaBrowser.ServerApplication/ApplicationHost.cs | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'MediaBrowser.ServerApplication')

diff --git a/MediaBrowser.ServerApplication/ApplicationHost.cs b/MediaBrowser.ServerApplication/ApplicationHost.cs
index 5c84b92af5..96aa9c9d59 100644
--- a/MediaBrowser.ServerApplication/ApplicationHost.cs
+++ b/MediaBrowser.ServerApplication/ApplicationHost.cs
@@ -277,19 +277,19 @@ namespace MediaBrowser.ServerApplication
             LogManager.RemoveConsoleOutput();
         }
 
-        public override Task Init(IProgress<double> progress)
+        public override async Task Init(IProgress<double> progress)
         {
             PerformVersionMigration();
 
-            return base.Init(progress);
+            await base.Init(progress).ConfigureAwait(false);
+
+            MigrateModularConfigurations();
+            ApplyDefaultMetadataSettings();
         }
 
         private void PerformVersionMigration()
         {
             DeleteDeprecatedModules();
-
-            MigrateModularConfigurations();
-            ApplyDefaultMetadataSettings();
         }
 
         private void MigrateModularConfigurations()
-- 
cgit v1.2.3