Fix play button starting wrong beatmap before selection loads #36104
+47
−0
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
When clicking the osu! cookie (play button) before a newly selected beatmap finishes loading, the previous beatmap would be played instead of the currently selected one. This was caused by the cookie reading from the global beatmap state which is debounced by 150ms, while the Enter key correctly used the carousel's current selection. The fix makes the cookie use the same beatmap source as Enter - the carousel's current selection - which is always up-to-date regardless of debounce timing. Closes ppy#36074
bdach
requested changes
Dec 23, 2025
Author
|
working on requested changes + attempting test coverage |
Tests the fix for issue ppy#36074 where clicking the play button immediately after selecting a different difficulty would start the wrong beatmap due to the 150ms selection debounce.
Member
|
Any reason this is draft? Also if you're happy with the new approach, please updated / empty the OP to match. |
Author
|
sorry @peppy, thought draft was appropriate since i was still updating it with the requested changes. marked it ready for review now and updated the description to match the new approach... |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Closes #36074
Fixes an issue where clicking the osu! cookie (play button) would start the wrong beatmap if clicked before the newly selected beatmap finishes loading (within 150ms of selection).
The song select screen uses a 150ms debounce when changing beatmap selection to avoid performance issues during rapid keyboard navigation. However, this created a race condition where the global Beatmap.Value wouldn't update immediately, causing the play button to start the old beatmap while pressing Enter would correctly play the new one.
Solution:
Added ensureGlobalBeatmapValid() calls before starting gameplay for both the logo click and Enter key handlers. This forces the debounced selection to flush immediately, ensuring both input methods read the correct beatmap.
Also includes test coverage that reproduces the race condition by selecting a different difficulty and immediately clicking the logo before the debounce completes.