diff options
| author | bunnei <bunneidev@gmail.com> | 2022-07-17 13:59:52 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-07-17 13:59:52 -0700 |
| commit | ba8ea956242537d862b4f9b5d27b95a5a6928ea7 (patch) | |
| tree | f776066179ea4c1e2671ff3dc3811ed7301261a9 /src/yuzu/main.cpp | |
| parent | a5bdf824e66d23a16af6a1b43256415570b1a8b3 (diff) | |
| parent | 6d160873c4c6a963057da5c3dca5c5f26e810052 (diff) | |
Merge pull request #8508 from yuzu-emu/mc-speed-limit
hle: service: nvflinger: Factor speed limit into frame time calculation.
Diffstat (limited to 'src/yuzu/main.cpp')
| -rw-r--r-- | src/yuzu/main.cpp | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/src/yuzu/main.cpp b/src/yuzu/main.cpp index b460020b1..ed802d329 100644 --- a/src/yuzu/main.cpp +++ b/src/yuzu/main.cpp @@ -1059,7 +1059,7 @@ void GMainWindow::InitializeHotkeys() { Settings::values.volume.SetValue(static_cast<u8>(new_volume)); }); connect_shortcut(QStringLiteral("Toggle Framerate Limit"), [] { - Settings::values.disable_fps_limit.SetValue(!Settings::values.disable_fps_limit.GetValue()); + Settings::values.use_speed_limit.SetValue(!Settings::values.use_speed_limit.GetValue()); }); connect_shortcut(QStringLiteral("Toggle Mouse Panning"), [&] { Settings::values.mouse_panning = !Settings::values.mouse_panning; @@ -1483,9 +1483,6 @@ void GMainWindow::BootGame(const QString& filename, u64 program_id, std::size_t Config per_game_config(*system, config_file_name, Config::ConfigType::PerGameConfig); } - // Disable fps limit toggle when booting a new title - Settings::values.disable_fps_limit.SetValue(false); - // Save configurations UpdateUISettings(); game_list->SaveInterfaceLayout(); @@ -3277,7 +3274,7 @@ void GMainWindow::UpdateStatusBar() { } else { emu_speed_label->setText(tr("Speed: %1%").arg(results.emulation_speed * 100.0, 0, 'f', 0)); } - if (Settings::values.disable_fps_limit) { + if (!Settings::values.use_speed_limit) { game_fps_label->setText( tr("Game: %1 FPS (Unlocked)").arg(results.average_game_fps, 0, 'f', 0)); } else { |