From fa17d8a2bc74a28e400770bcde2b5ba2cb5bc111 Mon Sep 17 00:00:00 2001 From: bunnei Date: Sat, 15 Aug 2020 22:41:21 -0400 Subject: [PATCH] android: config: Fix setting for use_frame_limit. --- src/android/app/src/main/jni/config.cpp | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/src/android/app/src/main/jni/config.cpp b/src/android/app/src/main/jni/config.cpp index 8047114b6..ac81e49d1 100644 --- a/src/android/app/src/main/jni/config.cpp +++ b/src/android/app/src/main/jni/config.cpp @@ -124,9 +124,14 @@ void Config::ReadValues() { Settings::values.resolution_factor = static_cast(sdl2_config->GetInteger("Renderer", "resolution_factor", 1)); Settings::values.use_vsync_new = sdl2_config->GetBoolean("Renderer", "use_vsync_new", true); - Settings::values.use_frame_limit = sdl2_config->GetBoolean("Renderer", "use_frame_limit", true); - Settings::values.frame_limit = - static_cast(sdl2_config->GetInteger("Renderer", "frame_limit", 100)); + + // Work around to map Android setting for enabling the frame limiter to the format Citra expects + if (sdl2_config->GetBoolean("Renderer", "use_frame_limit", true)) { + Settings::values.frame_limit = + static_cast(sdl2_config->GetInteger("Renderer", "frame_limit", 100)); + } else { + Settings::values.frame_limit = 0; + } Settings::values.render_3d = static_cast( sdl2_config->GetInteger("Renderer", "render_3d", 0));