DebugMenu: fixed comparator

Used to cause crashes on debug builds Also: In C++, comparator should return false if its arguments are equal.
gta-chaos-mod · Jan 21, 2025 · a8480a1 · a8480a1
1 parent 8cdd7fc
commit a8480a1
Showing 1 changed file with 10 additions and 5 deletions.
diff --git a/ChaosMod/Components/DebugMenu.cpp b/ChaosMod/Components/DebugMenu.cpp
@@ -36,12 +36,17 @@ DebugMenu::DebugMenu() : Component()
 	          [](const DebugEffect &a, const DebugEffect &b)
 	          {
 		          for (int idx = 0;; idx++)
-			          if (idx >= a.EffectName.size()
-			              || std::toupper(a.EffectName[idx]) < std::toupper(b.EffectName[idx]))
-				          return true;
-			          else if (idx >= b.EffectName.size()
-			                   || std::toupper(b.EffectName[idx]) < std::toupper(a.EffectName[idx]))
+		          {
+			          if (idx >= a.EffectName.size())
 				          return false;
+			          else if (idx >= b.EffectName.size())
+				          return true;
+
+					  auto ai = std::toupper(a.EffectName[idx]);
+			          auto bi = std::toupper(b.EffectName[idx]);
+			          if (ai != bi)
+				          return ai < bi;
+		          }
 	          });
 }