From 6ab6375ce6ca98ec97f599f3b54f6f2dad5d341b Mon Sep 17 00:00:00 2001 From: berichan <66521620+berichan@users.noreply.github.com> Date: Fri, 26 Feb 2021 18:09:33 +0000 Subject: [PATCH] Ensure associated item search does not search for whitespace --- NHSE.Core/Strings/GameStrings.cs | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/NHSE.Core/Strings/GameStrings.cs b/NHSE.Core/Strings/GameStrings.cs index d0cdb3b..6d0f8b3 100644 --- a/NHSE.Core/Strings/GameStrings.cs +++ b/NHSE.Core/Strings/GameStrings.cs @@ -214,16 +214,17 @@ private static string GetItemName60000(ushort index) /// Map of ItemID, ItemName public List GetAssociatedItems(ushort id, out string baseItemName) { + baseItemName = string.Empty; var stringMatch = GetItemName(id); var index = stringMatch.IndexOf('('); if (index < 0) - { - baseItemName = string.Empty; return new List(); - } var search = baseItemName = stringMatch.Substring(0, index); - return ItemDataSource.FindAll(x => x.Text.StartsWith(search)); + if (!string.IsNullOrWhiteSpace(search)) + return ItemDataSource.FindAll(x => x.Text.StartsWith(search)); + else + return new List(); } }