diff --git a/src/dusk/ui/controller_config.cpp b/src/dusk/ui/controller_config.cpp index 88baa7b29c..2c1d815ceb 100644 --- a/src/dusk/ui/controller_config.cpp +++ b/src/dusk/ui/controller_config.cpp @@ -301,7 +301,11 @@ int rumble_raw_to_percent(u16 raw) { } // namespace -ControllerConfigWindow::ControllerConfigWindow() { +ControllerConfigWindow::ControllerConfigWindow(bool prelaunch) { + if (prelaunch) { + mSuppressNavFallback = true; + } + listen( Rml::EventId::Keydown, [this](Rml::Event& event) { diff --git a/src/dusk/ui/controller_config.hpp b/src/dusk/ui/controller_config.hpp index 0fa096c7d1..df8533a492 100644 --- a/src/dusk/ui/controller_config.hpp +++ b/src/dusk/ui/controller_config.hpp @@ -8,7 +8,7 @@ namespace dusk::ui { class ControllerConfigWindow : public Window { public: - ControllerConfigWindow(); + ControllerConfigWindow(bool prelaunch); void update() override; void hide(bool close) override; diff --git a/src/dusk/ui/settings.cpp b/src/dusk/ui/settings.cpp index 83f6cceac5..edafc826be 100644 --- a/src/dusk/ui/settings.cpp +++ b/src/dusk/ui/settings.cpp @@ -620,7 +620,7 @@ SettingsWindow::SettingsWindow(bool prelaunch) : mPrelaunch(prelaunch) { leftPane.add_section("Controller"); leftPane.register_control(leftPane.add_button("Configure Controller").on_pressed([this] { - push(std::make_unique()); + push(std::make_unique(mPrelaunch)); }), rightPane, [](Pane& pane) { pane.clear();