Fix cringe bugs

slotthhy · Oct 21, 2023 · 4cc5e1f · 4cc5e1f
1 parent 10f5d20
commit 4cc5e1f
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 14 deletions.
diff --git a/Orchestrion/UI/Windows/MainWindow/MainWindow.Replacement.cs b/Orchestrion/UI/Windows/MainWindow/MainWindow.Replacement.cs
@@ -26,7 +26,7 @@ private void DrawReplacementList()
         foreach (var replacement in Configuration.Instance.SongReplacements.Values)
         {
             if (!SongList.Instance.TryGetSong(replacement.TargetSongId, out var targetSong)) continue;
-            if (!SongList.Instance.TryGetSong(replacement.ReplacementId, out var replacementSong)) continue;
+            if (!SongList.Instance.TryGetSong(replacement.ReplacementId, out var replacementSong) && replacement.ReplacementId != SongReplacementEntry.NoChangeId) continue;
             if (!Util.SearchMatches(_searchText, targetSong) && !Util.SearchMatches(_searchText, replacementSong)) continue;
 
             ImGui.Spacing();

diff --git a/Orchestrion/Util.cs b/Orchestrion/Util.cs
@@ -40,21 +40,28 @@ public static bool SearchMatches(string searchText, Song song)
 
 		var matchesSearch = false;
 
-		foreach (var titleLang in AvailableTitleLanguages)
+		try
 		{
-			matchesSearch |= song.Strings[titleLang].Name.ToLower().Contains(searchText.ToLower());
-			matchesSearch |= song.Strings[titleLang].AlternateName.ToLower().Contains(searchText.ToLower());
-			matchesSearch |= song.Strings[titleLang].SpecialModeName.ToLower().Contains(searchText.ToLower());	
+			foreach (var titleLang in AvailableTitleLanguages)
+			{
+				matchesSearch |= song.Strings[titleLang].Name.ToLower().Contains(searchText.ToLower());
+				matchesSearch |= song.Strings[titleLang].AlternateName.ToLower().Contains(searchText.ToLower());
+				matchesSearch |= song.Strings[titleLang].SpecialModeName.ToLower().Contains(searchText.ToLower());
+			}
+
+			// Id check
+			matchesSearch |= song.Id.ToString().Contains(searchText);
+
+			// Localized addtl info check
+			var strings = song.Strings["en"];
+			song.Strings.TryGetValue(lang, out strings);
+			matchesSearch |= strings.Locations.ToLower().Contains(searchText.ToLower());
+			matchesSearch |= strings.AdditionalInfo.ToLower().Contains(searchText.ToLower());
+		}
+		catch (Exception ignore)
+		{
+
 		}
-
-		// Id check
-		matchesSearch |= song.Id.ToString().Contains(searchText);
-
-		// Localized addtl info check
-		var strings = song.Strings["en"];
-		song.Strings.TryGetValue(lang, out strings);
-		matchesSearch |= strings.Locations.ToLower().Contains(searchText.ToLower());
-		matchesSearch |= strings.AdditionalInfo.ToLower().Contains(searchText.ToLower());
 
 		return matchesSearch;
 	}