mirrors/Remotely
3
0
Fork 0
mirror of https://github.com/immense/Remotely.git synced 2025-10-26 11:27:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix NRE in ViewerPageDataProvider. (#571)

Browse Source
This commit is contained in:
Jared Goodwin 2023-01-20 07:32:36 -08:00 committed by GitHub
parent c5a1a56bdf
commit 97e31b44fc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Server/Services/RcImplementations/ViewerPageDataProvider.cs
View File

@ -21,8 +21,19 @@ namespace Remotely.Server.Services.RcImplementations
public string GetUserDisplayName(PageModel pageModel)
{
if (string.IsNullOrWhiteSpace(pageModel?.User?.Identity?.Name))
{
return string.Empty;
}
var user = _dataService.GetUserByNameWithOrg(pageModel.User.Identity.Name);
return user.UserOptions?.DisplayName ?? user.UserName;
if (user is null)
{
return string.Empty;
}
return user.UserOptions?.DisplayName ?? user.UserName ?? string.Empty;
}
public ViewerPageTheme GetTheme(PageModel pageModel)