From e276532f2fc076fcc7b200beed03bb5de3b4917b Mon Sep 17 00:00:00 2001 From: Anthony Lavado Date: Fri, 31 Jul 2020 08:26:59 -0700 Subject: [PATCH] Merge pull request #3727 from K900/patch-1 Fix #3624 (cherry picked from commit 06db5f8bca0b27663714ae7f8dc39084749a191e) Signed-off-by: Joshua M. Boniface --- Jellyfin.Server.Implementations/Users/UserManager.cs | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/Jellyfin.Server.Implementations/Users/UserManager.cs b/Jellyfin.Server.Implementations/Users/UserManager.cs index d4c8651e8c..d40def9f28 100644 --- a/Jellyfin.Server.Implementations/Users/UserManager.cs +++ b/Jellyfin.Server.Implementations/Users/UserManager.cs @@ -592,18 +592,13 @@ namespace Jellyfin.Server.Implementations.Users } var defaultName = Environment.UserName; - if (string.IsNullOrWhiteSpace(defaultName)) + if (string.IsNullOrWhiteSpace(defaultName) || !IsValidUsername(defaultName)) { defaultName = "MyJellyfinUser"; } _logger.LogWarning("No users, creating one with username {UserName}", defaultName); - if (!IsValidUsername(defaultName)) - { - throw new ArgumentException("Provided username is not valid!", defaultName); - } - var newUser = CreateUser(defaultName); newUser.SetPermission(PermissionKind.IsAdministrator, true); newUser.SetPermission(PermissionKind.EnableContentDeletion, true);