Fix nullref when opening files or URIs on startup on Android #31492
Conversation
This file contains 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
Could happen if we get a malformed intent without data
Susko3
added
platform/android
area:import
|
Not sure we want to be doing this here, rather than a potential change to how things are handled framework side. I think smoogi has better understanding of expectations here. |
smoogipoo
approved these changes
Jan 14, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
I think this regressed with SDL3, as
CreateGame()is called later in the startup process compared to osutk. This will cause theprivate OsuGameAndroid game = null!;to be null. But we promised it won't be, so it's a nullref when the intent handling code tries to callgame.Import().To fix this,
OsuGameAndroidis constructed immediately. AndCreateGame()will just return that existing game. I also added a guard against callingCreateGame()twice. Calling it twice will likely crash somewhere deep in framework code, this just makes the failure point obvious.Also fixes some nullrefs in intent handling, unrelated to the above issues.