From e381f99b5a4ed4a3f96793b929f5ee2da6703eda Mon Sep 17 00:00:00 2001 From: Schedel Pascal Date: Mon, 17 Jun 2024 08:38:10 +0200 Subject: [PATCH] simpler nullcheck --- OwnChar/Manager/OwnCharManager.cs | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/OwnChar/Manager/OwnCharManager.cs b/OwnChar/Manager/OwnCharManager.cs index 2d91af5..f275111 100644 --- a/OwnChar/Manager/OwnCharManager.cs +++ b/OwnChar/Manager/OwnCharManager.cs @@ -9,7 +9,8 @@ namespace OwnChar.Manager; public class OwnCharManager { // User - public bool IsLoggedIn => CurrentUser != null; + [MemberNotNullWhen(true, nameof(CurrentUser), nameof(DataManager))] + public bool IsLoggedIn => CurrentUser != null && DataManager != null; public UserAccount? CurrentUser { get; private set; } // Data Provider @@ -30,7 +31,7 @@ public class OwnCharManager [MemberNotNull(nameof(CurrentUser), nameof(DataManager))] internal protected void CheckLogin() { - if (DataManager == null || CurrentUser == null || !IsLoggedIn) + if (!IsLoggedIn) throw new LoginException("You are already logged in!"); }