diff options
| author | 2023-08-26 19:15:00 -0400 | |
|---|---|---|
| committer | 2023-08-26 19:15:00 -0400 | |
| commit | 6c4abd23be375afda850661cdf164b65e52f8cb8 (patch) | |
| tree | 4245dfb837da484556040bb02915d0e7b53569c8 /src/core/frontend/applets/controller.cpp | |
| parent | Merge pull request #11359 from Kelebek1/check_suitable_backend (diff) | |
| parent | main: Fix docked mode button, clang 14 error (diff) | |
| download | yuzu-6c4abd23be375afda850661cdf164b65e52f8cb8.tar.gz yuzu-6c4abd23be375afda850661cdf164b65e52f8cb8.tar.xz yuzu-6c4abd23be375afda850661cdf164b65e52f8cb8.zip | |
Merge pull request #11356 from lat9nq/console-mode-pg
general,config-qt: Present Console Mode as an enum with separate options in game properties
Diffstat (limited to 'src/core/frontend/applets/controller.cpp')
| -rw-r--r-- | src/core/frontend/applets/controller.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/core/frontend/applets/controller.cpp b/src/core/frontend/applets/controller.cpp index 3300d4f79..27755cb58 100644 --- a/src/core/frontend/applets/controller.cpp +++ b/src/core/frontend/applets/controller.cpp | |||
| @@ -3,6 +3,8 @@ | |||
| 3 | 3 | ||
| 4 | #include "common/assert.h" | 4 | #include "common/assert.h" |
| 5 | #include "common/logging/log.h" | 5 | #include "common/logging/log.h" |
| 6 | #include "common/settings.h" | ||
| 7 | #include "common/settings_enums.h" | ||
| 6 | #include "core/frontend/applets/controller.h" | 8 | #include "core/frontend/applets/controller.h" |
| 7 | #include "core/hid/emulated_controller.h" | 9 | #include "core/hid/emulated_controller.h" |
| 8 | #include "core/hid/hid_core.h" | 10 | #include "core/hid/hid_core.h" |
| @@ -62,7 +64,7 @@ void DefaultControllerApplet::ReconfigureControllers(ReconfigureCallback callbac | |||
| 62 | controller->Connect(true); | 64 | controller->Connect(true); |
| 63 | } | 65 | } |
| 64 | } else if (index == 0 && parameters.enable_single_mode && parameters.allow_handheld && | 66 | } else if (index == 0 && parameters.enable_single_mode && parameters.allow_handheld && |
| 65 | !Settings::values.use_docked_mode.GetValue()) { | 67 | !Settings::IsDockedMode()) { |
| 66 | // We should *never* reach here under any normal circumstances. | 68 | // We should *never* reach here under any normal circumstances. |
| 67 | controller->SetNpadStyleIndex(Core::HID::NpadStyleIndex::Handheld); | 69 | controller->SetNpadStyleIndex(Core::HID::NpadStyleIndex::Handheld); |
| 68 | controller->Connect(true); | 70 | controller->Connect(true); |