summaryrefslogtreecommitdiffstats
path: root/src/android/app
diff options
context:
space:
mode:
authorliamwhite <liamwhite@users.noreply.github.com>2023-08-27 01:15:00 +0200
committerGitHub <noreply@github.com>2023-08-27 01:15:00 +0200
commit6c4abd23be375afda850661cdf164b65e52f8cb8 (patch)
tree4245dfb837da484556040bb02915d0e7b53569c8 /src/android/app
parentMerge pull request #11359 from Kelebek1/check_suitable_backend (diff)
parentmain: Fix docked mode button, clang 14 error (diff)
downloadyuzu-6c4abd23be375afda850661cdf164b65e52f8cb8.tar
yuzu-6c4abd23be375afda850661cdf164b65e52f8cb8.tar.gz
yuzu-6c4abd23be375afda850661cdf164b65e52f8cb8.tar.bz2
yuzu-6c4abd23be375afda850661cdf164b65e52f8cb8.tar.lz
yuzu-6c4abd23be375afda850661cdf164b65e52f8cb8.tar.xz
yuzu-6c4abd23be375afda850661cdf164b65e52f8cb8.tar.zst
yuzu-6c4abd23be375afda850661cdf164b65e52f8cb8.zip
Diffstat (limited to 'src/android/app')
-rw-r--r--src/android/app/src/main/jni/config.cpp5
-rw-r--r--src/android/app/src/main/jni/native.cpp2
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) {