From f3830432d08030e24f43c11277808f3210c6cd7f Mon Sep 17 00:00:00 2001 From: bunnei Date: Fri, 24 Jul 2020 22:00:48 -0400 Subject: [PATCH] android: config: Fix settings conflict with use_frame_limit_alternate. --- .../citra/citra_emu/features/settings/utils/SettingsFile.java | 2 +- src/android/app/src/main/jni/config.cpp | 2 +- src/android/app/src/main/jni/default_ini.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/android/app/src/main/java/org/citra/citra_emu/features/settings/utils/SettingsFile.java b/src/android/app/src/main/java/org/citra/citra_emu/features/settings/utils/SettingsFile.java index bf577d366..f7984a9d3 100644 --- a/src/android/app/src/main/java/org/citra/citra_emu/features/settings/utils/SettingsFile.java +++ b/src/android/app/src/main/java/org/citra/citra_emu/features/settings/utils/SettingsFile.java @@ -45,7 +45,7 @@ public final class SettingsFile { public static final String KEY_USE_SHADER_JIT = "use_shader_jit"; public static final String KEY_USE_VSYNC = "use_vsync_new"; public static final String KEY_RESOLUTION_FACTOR = "resolution_factor"; - public static final String KEY_FRAME_LIMIT_ENABLED = "use_frame_limit"; + public static final String KEY_FRAME_LIMIT_ENABLED = "use_frame_limit_alternate"; public static final String KEY_FRAME_LIMIT = "frame_limit"; public static final String KEY_BACKGROUND_RED = "bg_red"; public static final String KEY_BACKGROUND_BLUE = "bg_blue"; diff --git a/src/android/app/src/main/jni/config.cpp b/src/android/app/src/main/jni/config.cpp index 6b2d45ee3..ccb0bba16 100644 --- a/src/android/app/src/main/jni/config.cpp +++ b/src/android/app/src/main/jni/config.cpp @@ -124,7 +124,7 @@ 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.use_frame_limit_alternate = sdl2_config->GetBoolean("Renderer", "use_frame_limit_alternate", true); Settings::values.frame_limit = static_cast(sdl2_config->GetInteger("Renderer", "frame_limit", 100)); diff --git a/src/android/app/src/main/jni/default_ini.h b/src/android/app/src/main/jni/default_ini.h index 12645faed..ec014dd8c 100644 --- a/src/android/app/src/main/jni/default_ini.h +++ b/src/android/app/src/main/jni/default_ini.h @@ -127,7 +127,7 @@ vsync_enabled = # Turns on the frame limiter, which will limit frames output to the target game speed # 0: Off, 1: On (default) -use_frame_limit = +use_frame_limit_alternate = # Limits the speed of the game to run no faster than this value as a percentage of target speed # 1 - 9999: Speed limit as a percentage of target game speed. 100 (default)