diff options
| author | liamwhite <liamwhite@users.noreply.github.com> | 2023-08-26 19:15:00 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-08-26 19:15:00 -0400 |
| commit | 6c4abd23be375afda850661cdf164b65e52f8cb8 (patch) | |
| tree | 4245dfb837da484556040bb02915d0e7b53569c8 /src/android | |
| parent | 84b384fbeafcb49f7ded1300cfc9dfa319a2fd3a (diff) | |
| parent | 1cdd11d9f5541ba9b49baf3dddcb7e411f035669 (diff) | |
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/android')
| -rw-r--r-- | src/android/app/src/main/jni/config.cpp | 5 | ||||
| -rw-r--r-- | src/android/app/src/main/jni/native.cpp | 2 |
2 files changed, 5 insertions, 2 deletions
diff --git a/src/android/app/src/main/jni/config.cpp b/src/android/app/src/main/jni/config.cpp index 5e1f10f99..9de9bd93e 100644 --- a/src/android/app/src/main/jni/config.cpp +++ b/src/android/app/src/main/jni/config.cpp @@ -11,6 +11,7 @@ #include "common/fs/path_util.h" #include "common/logging/log.h" #include "common/settings.h" +#include "common/settings_enums.h" #include "core/hle/service/acc/profile_manager.h" #include "input_common/main.h" #include "jni/config.h" @@ -144,7 +145,9 @@ void Config::ReadValues() { Service::Account::MAX_USERS - 1); // Disable docked mode by default on Android - Settings::values.use_docked_mode = config->GetBoolean("System", "use_docked_mode", false); + Settings::values.use_docked_mode.SetValue(config->GetBoolean("System", "use_docked_mode", false) + ? Settings::ConsoleMode::Docked + : Settings::ConsoleMode::Handheld); const auto rng_seed_enabled = config->GetBoolean("System", "rng_seed_enabled", false); if (rng_seed_enabled) { diff --git a/src/android/app/src/main/jni/native.cpp b/src/android/app/src/main/jni/native.cpp index 8b99d1d6e..7e17833a0 100644 --- a/src/android/app/src/main/jni/native.cpp +++ b/src/android/app/src/main/jni/native.cpp @@ -420,7 +420,7 @@ public: return false; } - return !Settings::values.use_docked_mode.GetValue(); + return !Settings::IsDockedMode(); } void SetDeviceType([[maybe_unused]] int index, int type) { |