Skip to content

Add activity state detection to prevent parameter conflicts when resuming from home screen after external game launch#18231

Merged
LibretroAdmin merged 2 commits intolibretro:masterfrom
mattakins:master
Sep 3, 2025
Merged

Add activity state detection to prevent parameter conflicts when resuming from home screen after external game launch#18231
LibretroAdmin merged 2 commits intolibretro:masterfrom
mattakins:master

Conversation

@mattakins
Copy link
Copy Markdown
Contributor

@mattakins mattakins commented Sep 2, 2025

Description

After launching a game from a launcher like Daijishou or Beacon using FLAG_ACTIVITY_CLEAR_TOP, RetroArch would crash if resume was attempted from a home screen launch due to parameter conflicts. This fix adds activity state detection to prevent these parameter conflicts by bringing RetroArch to the front without passing any parameters if RetroActivityFuture is already running (indicating a game was launched externally). This also simplifies the content detection logic in OnNewIntent introduced in #18210.

Related Pull Requests

#18210 - Add onNewIntent handler to support game launch with FLAG_ACTIVITY_CLEAR_TOP

@hizzlekizzle
Copy link
Copy Markdown
Collaborator

hizzlekizzle commented Sep 2, 2025

the CI build failures are unrelated to this PR

@LibretroAdmin LibretroAdmin merged commit bd56674 into libretro:master Sep 3, 2025
28 of 31 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants