From a4e0592249f29185298ce638ff4467f01ca383a3 Mon Sep 17 00:00:00 2001 From: Stanley Dimant Date: Tue, 29 Oct 2024 16:59:34 +0100 Subject: [PATCH] fix some uid picker blemishes --- MareSynchronos/UI/UISharedService.cs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/MareSynchronos/UI/UISharedService.cs b/MareSynchronos/UI/UISharedService.cs index 7e972e8..b202489 100644 --- a/MareSynchronos/UI/UISharedService.cs +++ b/MareSynchronos/UI/UISharedService.cs @@ -876,7 +876,7 @@ public partial class UiSharedService : DisposableMediatorSubscriberBase using (ImRaii.Disabled(_discordOAuthUIDs == null)) { var aliasPairs = _discordOAuthUIDs?.Result?.Select(t => new UIDAliasPair(t.Key, t.Value)).ToList() ?? [new UIDAliasPair(item.UID ?? null, null)]; - var uidComboName = "UID###" + item.CharacterName + item.WorldId + serverUri + indexOffset; + var uidComboName = "UID###" + item.CharacterName + item.WorldId + serverUri + indexOffset + aliasPairs.Count; DrawCombo(uidComboName, aliasPairs, (v) => { @@ -895,9 +895,9 @@ public partial class UiSharedService : DisposableMediatorSubscriberBase }, (v) => { - if (!string.Equals(v.UID, item.UID, StringComparison.Ordinal)) + if (!string.Equals(v?.UID ?? null, item.UID, StringComparison.Ordinal)) { - item.UID = v.UID; + item.UID = v?.UID ?? null; _serverConfigurationManager.Save(); } },