From 59ef4b37e5061de5c3f697d232c2b06b5caaf493 Mon Sep 17 00:00:00 2001
From: yugecin <yugecin@users.noreply.github.com>
Date: Sun, 29 Jan 2017 16:53:14 +0100
Subject: [PATCH] fix option searching

---
 src/itdelatrisu/opsu/Options.java            |  2 +-
 src/yugecin/opsudance/ui/OptionsOverlay.java | 19 ++++++-------------
 2 files changed, 7 insertions(+), 14 deletions(-)

diff --git a/src/itdelatrisu/opsu/Options.java b/src/itdelatrisu/opsu/Options.java
index 5a2d5b71..ab386e4c 100644
--- a/src/itdelatrisu/opsu/Options.java
+++ b/src/itdelatrisu/opsu/Options.java
@@ -1210,7 +1210,7 @@ public class Options {
 				filtered = false;
 				return false;
 			}
-			filtered = !(displayName.toLowerCase().contains(searchString) || description.toLowerCase().contains(searchString));
+			filtered = !name.toLowerCase().contains(searchString) && !description.toLowerCase().contains(searchString);
 			return filtered;
 		}
 
diff --git a/src/yugecin/opsudance/ui/OptionsOverlay.java b/src/yugecin/opsudance/ui/OptionsOverlay.java
index e01f63df..43e1f733 100644
--- a/src/yugecin/opsudance/ui/OptionsOverlay.java
+++ b/src/yugecin/opsudance/ui/OptionsOverlay.java
@@ -870,8 +870,7 @@ public class OptionsOverlay extends OverlayOpsuState {
 	private void updateSearch() {
 		OptionTab lastBigSection = null;
 		boolean lastBigSectionMatches = false;
-		for (int sectionIndex = 0; sectionIndex < sections.length; sectionIndex++) {
-			OptionTab section = sections[sectionIndex];
+		for (OptionTab section : sections) {
 			boolean sectionMatches = section.name.toLowerCase().contains(lastSearchText);
 			if (section.options == null) {
 				lastBigSectionMatches = sectionMatches;
@@ -879,24 +878,18 @@ public class OptionsOverlay extends OverlayOpsuState {
 				section.filtered = true;
 				continue;
 			}
-			boolean allOptionsHidden = true;
-			for (int optionIndex = 0; optionIndex < section.options.length; optionIndex++) {
-				GameOption option = section.options[optionIndex];
+			section.filtered = true;
+			for (GameOption option : section.options) {
 				if (lastBigSectionMatches || sectionMatches) {
-					allOptionsHidden = false;
+					section.filtered = false;
 					option.filter(null);
 					continue;
 				}
 				if (!option.filter(lastSearchText)) {
-					allOptionsHidden = false;
+					section.filtered = false;
+					lastBigSection.filtered = false;
 				}
 			}
-			if (allOptionsHidden) {
-				section.filtered = true;
-			} else {
-				lastBigSection.filtered = false;
-				section.filtered = false;
-			}
 		}
 		updateHoverOption(prevMouseX, prevMouseY);
 	}