diff options
| author | Joshua M. Boniface <joshua@boniface.me> | 2020-07-23 18:08:29 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-23 18:08:29 -0400 |
| commit | 845ee21ddce8ed91d8c3c1463d0d7a06bb769635 (patch) | |
| tree | 0238c4c0d4e2c07df7d59433f26c53d3f2b7768d /Jellyfin.Api/Controllers/StartupController.cs | |
| parent | 8960d6256fe605b88391460c93759cd516bac3b9 (diff) | |
| parent | 941f326c0b786ba8bac02dd745ea998055e6e554 (diff) | |
Merge pull request #3664 from Bond-009/createuserasync
Make CreateUser async
Diffstat (limited to 'Jellyfin.Api/Controllers/StartupController.cs')
| -rw-r--r-- | Jellyfin.Api/Controllers/StartupController.cs | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/Jellyfin.Api/Controllers/StartupController.cs b/Jellyfin.Api/Controllers/StartupController.cs index 04f134b8b..93fb22c4e 100644 --- a/Jellyfin.Api/Controllers/StartupController.cs +++ b/Jellyfin.Api/Controllers/StartupController.cs @@ -46,14 +46,12 @@ namespace Jellyfin.Api.Controllers [HttpGet("Configuration")] public StartupConfigurationDto GetStartupConfiguration() { - var result = new StartupConfigurationDto + return new StartupConfigurationDto { UICulture = _config.Configuration.UICulture, MetadataCountryCode = _config.Configuration.MetadataCountryCode, PreferredMetadataLanguage = _config.Configuration.PreferredMetadataLanguage }; - - return result; } /// <summary> @@ -92,10 +90,10 @@ namespace Jellyfin.Api.Controllers /// </summary> /// <returns>The first user.</returns> [HttpGet("User")] - public StartupUserDto GetFirstUser() + public async Task<StartupUserDto> GetFirstUser() { // TODO: Remove this method when startup wizard no longer requires an existing user. - _userManager.Initialize(); + await _userManager.InitializeAsync().ConfigureAwait(false); var user = _userManager.Users.First(); return new StartupUserDto { |
