From d7344bde951ab02a82b4b0c41ee95edfb8a70b19 Mon Sep 17 00:00:00 2001 From: DrSmugleaf Date: Mon, 14 Aug 2023 14:05:47 -0700 Subject: [PATCH] Fix editing a watchlist note temporarily making it appear as a low severity note (#19100) * Fix editing a watchlist temporarily making it appear as a low severity note * Change condition to check that the note type is anything other than note * Revert "Change condition to check that the note type is anything other than note" This reverts commit 5c12d89fe8b3547dc11b19bb04e980fe4e7bf206. * Update Content.Client/Administration/UI/Notes/AdminNotesLine.xaml.cs Co-authored-by: Chief-Engineer <119664036+Chief-Engineer@users.noreply.github.com> * Check that the note type doesn't have a special icon instead --------- Co-authored-by: Chief-Engineer <119664036+Chief-Engineer@users.noreply.github.com> --- .../Administration/UI/Notes/AdminNotesLine.xaml.cs | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/Content.Client/Administration/UI/Notes/AdminNotesLine.xaml.cs b/Content.Client/Administration/UI/Notes/AdminNotesLine.xaml.cs index 5852653cdb..e70248880b 100644 --- a/Content.Client/Administration/UI/Notes/AdminNotesLine.xaml.cs +++ b/Content.Client/Administration/UI/Notes/AdminNotesLine.xaml.cs @@ -1,11 +1,8 @@ using System.Text; -using Content.Client.Resources; using Content.Shared.Administration.Notes; using Content.Shared.Database; using Robust.Client.AutoGenerated; using Robust.Client.GameObjects; -using Robust.Client.Graphics; -using Robust.Client.ResourceManagement; using Robust.Client.UserInterface; using Robust.Client.UserInterface.Controls; using Robust.Client.UserInterface.XAML; @@ -56,7 +53,7 @@ public sealed partial class AdminNotesLine : BoxContainer private void Refresh() { string? iconPath; - if(Note.NoteSeverity is not null) + if (Note.NoteSeverity is not null && !NoteTypeIcons.ContainsKey(Note.NoteType)) SeverityIcons.TryGetValue(Note.NoteSeverity.Value, out iconPath); else NoteTypeIcons.TryGetValue(Note.NoteType, out iconPath);