ad3laid3/skate3recomp-multiplayer
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

ui: guard the settings-menu gamepad poll against runtime teardown

Browse source
This commit is contained in:
mchughalex 2026-07-21 10:50:13 +01:00
parent 9fb6e5505f
commit 25c68a89d7
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/skate3_app_common.cpp
View file

@ -909,7 +909,11 @@ void Skate3BaseApp::ToggleSimpleSettings() {
// zeroes guest-facing input while the settings screen is open. // zeroes guest-facing input while the settings screen is open.
auto poll_gamepad = [this]() { auto poll_gamepad = [this]() {
rex::ui::SimpleSettingsGamepad pad; rex::ui::SimpleSettingsGamepad pad;
auto* input_system = static_cast<rex::input::InputSystem*>(runtime()->input_system()); // The dialog can be painted (and thus poll) during a frame that races
// runtime teardown at close time, when runtime() is already gone.
auto* rt = runtime();
auto* input_system =
rt ? static_cast<rex::input::InputSystem*>(rt->input_system()) : nullptr;
if (input_system) { if (input_system) {
rex::input::X_INPUT_GAMEPAD state; rex::input::X_INPUT_GAMEPAD state;
if (input_system->GetUiGamepadState(&state)) { if (input_system->GetUiGamepadState(&state)) {