summaryrefslogtreecommitdiff
path: root/src/yuzu/configuration/configure_general.cpp
diff options
context:
space:
mode:
authorbunnei <bunneidev@gmail.com>2021-07-25 16:23:44 -0700
committerGitHub <noreply@github.com>2021-07-25 16:23:44 -0700
commitc09557acd8a1880b0f19cc13d5fde46186363c3d (patch)
tree2e1ddda5bd411f69d90c8efd214910aec3ec9b06 /src/yuzu/configuration/configure_general.cpp
parent7e272d3cd81656b65b21f5a569fc9a2d76cac758 (diff)
parent2c6e274b3978ce4ee1af98e21f101e7037ec9d24 (diff)
Merge pull request #6697 from ameerj/fps-cap
config, nvflinger: Add FPS cap setting
Diffstat (limited to 'src/yuzu/configuration/configure_general.cpp')
-rw-r--r--src/yuzu/configuration/configure_general.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/yuzu/configuration/configure_general.cpp b/src/yuzu/configuration/configure_general.cpp
index 18f25def6..d79d2e23e 100644
--- a/src/yuzu/configuration/configure_general.cpp
+++ b/src/yuzu/configuration/configure_general.cpp
@@ -48,6 +48,8 @@ void ConfigureGeneral::SetConfiguration() {
ui->toggle_frame_limit->setChecked(Settings::values.use_frame_limit.GetValue());
ui->frame_limit->setValue(Settings::values.frame_limit.GetValue());
+ ui->fps_cap->setValue(Settings::values.fps_cap.GetValue());
+
ui->button_reset_defaults->setEnabled(runtime_lock);
if (Settings::IsConfiguringGlobal()) {
@@ -87,6 +89,8 @@ void ConfigureGeneral::ApplyConfiguration() {
UISettings::values.pause_when_in_background = ui->toggle_background_pause->isChecked();
UISettings::values.hide_mouse = ui->toggle_hide_mouse->isChecked();
+ Settings::values.fps_cap.SetValue(ui->fps_cap->value());
+
// Guard if during game and set to game-specific value
if (Settings::values.use_frame_limit.UsingGlobal()) {
Settings::values.use_frame_limit.SetValue(ui->toggle_frame_limit->checkState() ==