Skip to content

Fix wrongly used value in enum handling in the settings menu #1101

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Wartori54 wants to merge 2 commits into
base: dev
Choose a base branch
from
Open

Fix wrongly used value in enum handling in the settings menu #1101

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7464aea
Fix wrongly used `value` in enum handling
Wartori54 Apr 3, 2026
bfea749
Add break to loop
Wartori54 Apr 5, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 11 additions & 5 deletions Celeste.Mod.mm/Mod/Module/EverestModule.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -746,10 +746,16 @@ TextMenu.Item CreateItem(PropertyInfo prop, string name = null, object settingsO
);
});
}
else if (propType.IsEnum)
{
else if (propType.IsEnum) {
Array enumValues = Enum.GetValues(propType);

@wuke32767 wuke32767 May 23, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

should we .distinct() it first?

@Wartori54 Wartori54 May 23, 2026

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Depends on how we want to handle that case. I'd say it is not really beneficial to eliminate duplicate values since having indistinguishable enum values does not make much sense in an enum for configuration. Thus we shouldn't handle that case.

Array.Sort((int[]) enumValues);
Array.Sort(enumValues);
int valueIndex = 0; // Default to the first option if the value is not found
for (int i = 0; i < enumValues.Length; i++) {
if (enumValues.GetValue(i).Equals(value)) {
valueIndex = i;
Comment thread
Wartori54 marked this conversation as resolved.
break;
}
}
string enumNamePrefix = $"{nameDefaultPrefix}{prop.Name.ToLowerInvariant()}_";
item =
new TextMenu.Slider(name, (i) => {
Expand All @@ -758,8 +764,8 @@ TextMenu.Item CreateItem(PropertyInfo prop, string name = null, object settingsO
$"{enumNamePrefix}{enumName.ToLowerInvariant()}".DialogCleanOrNull() ??
$"modoptions_{propType.Name.ToLowerInvariant()}_{enumName.ToLowerInvariant()}".DialogCleanOrNull() ??
enumName;
}, 0, enumValues.Length - 1, (int) value)
.Change(v => prop.SetValue(settingsObject, v));
}, 0, enumValues.Length - 1, valueIndex)
.Change(v => prop.SetValue(settingsObject, enumValues.GetValue(v)));
}
else if (propType == typeof(string))
{
Expand Down
Loading