Options in RetroArch staying on the same index, not same option

[DarkSide1305]

First and foremost consider this:

• Only RetroArch bugs should be filed here. Not core bugs or game bugs
• This is not a forum or a help section, this is strictly developer oriented

Description

The Bug I found occurs if changing a setting adds new settings. The cursor stays on the same "index" (so third options from above for example) and not the same "option". This is further explained in this Github issue from MelonDSDS:
JesseTG/melonds-ds#134

Expected behavior

Theres is no real expected behavior, as this is probably just a usability oversight, the cursor should probably stay on the same option, not the same index for less confusing navigation.

Actual behavior

As described above, cursor stays on index, not option.

Steps to reproduce the bug

1. In the MelonDSDS core (https://github.com/JesseTG/melonds-ds) change in Core Options -> Screen the Layout, you will see the cursor jumping

Bisect Results

Version/Commit

You can find this information under Information/System Information

• RetroArch: Not a specific version, but im using 1.16.0 Flatpak

Environment information

• OS: SteamOS 3.5 or whatever the newest is, I dont think it matters either.
• Compiler: -