aboutsummaryrefslogtreecommitdiff
path: root/MediaBrowser.ServerApplication/ApplicationHost.cs
diff options
context:
space:
mode:
authorLuke Pulverenti <luke.pulverenti@gmail.com>2014-06-30 09:28:38 -0400
committerLuke Pulverenti <luke.pulverenti@gmail.com>2014-06-30 09:28:38 -0400
commitf0da58a997ed01635225ae5290d7f34997b99452 (patch)
tree91cbf8c34aff65d1384a2e1277c3544aeb9e0c09 /MediaBrowser.ServerApplication/ApplicationHost.cs
parent62d98551edf421ba50f2eadf95d6c3d1fb1d20ae (diff)
fix config startup
Diffstat (limited to 'MediaBrowser.ServerApplication/ApplicationHost.cs')
-rw-r--r--MediaBrowser.ServerApplication/ApplicationHost.cs10
1 files changed, 5 insertions, 5 deletions
diff --git a/MediaBrowser.ServerApplication/ApplicationHost.cs b/MediaBrowser.ServerApplication/ApplicationHost.cs
index 5c84b92af..96aa9c9d5 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()