From 9907c4de8ac856d6faa14580f74ee129f5a67b17 Mon Sep 17 00:00:00 2001 From: illusion0001 <37698908+illusion0001@users.noreply.github.com> Date: Sat, 1 Oct 2022 13:06:23 -0500 Subject: [PATCH 1/3] Don't auto adjust framerate plot --- trdrop/headers/cpp_interface/framerateplot.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/trdrop/headers/cpp_interface/framerateplot.h b/trdrop/headers/cpp_interface/framerateplot.h index 1334a81f..77a8a3ad 100644 --- a/trdrop/headers/cpp_interface/framerateplot.h +++ b/trdrop/headers/cpp_interface/framerateplot.h @@ -484,7 +484,7 @@ class FrameratePlot { const double manual_set_max_framerate = _shared_general_options_model->get_framerate_max_fps(); const double real_max_framerate = _shared_framerate_model->get_max_framerate_bounds(); - if (manual_set_max_framerate < real_max_framerate) return real_max_framerate; + if (manual_set_max_framerate < real_max_framerate) return manual_set_max_framerate; } //! get text offset for shadows below the text From 60204ed570904efda5e2b1773b38e4612de976ca Mon Sep 17 00:00:00 2001 From: illusion0001 <37698908+illusion0001@users.noreply.github.com> Date: Sat, 1 Oct 2022 13:07:29 -0500 Subject: [PATCH 2/3] Update frametimeplot.h --- trdrop/headers/cpp_interface/frametimeplot.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/trdrop/headers/cpp_interface/frametimeplot.h b/trdrop/headers/cpp_interface/frametimeplot.h index 8746f29d..4416c4dc 100644 --- a/trdrop/headers/cpp_interface/frametimeplot.h +++ b/trdrop/headers/cpp_interface/frametimeplot.h @@ -437,7 +437,7 @@ class FrametimePlot { const double manual_set_max_frametime = _shared_general_options_model->get_frametime_max_ms(); const double real_max_frametime = _shared_frametime_model->get_max_frametime_bounds(); - if (manual_set_max_frametime < real_max_frametime) return real_max_frametime; + if (manual_set_max_frametime < real_max_frametime) return manual_set_max_frametime; } From 173bf2f0834bb1f95a7109c47d4fbed4ea00db1d Mon Sep 17 00:00:00 2001 From: illusion0001 <37698908+illusion0001@users.noreply.github.com> Date: Sat, 1 Oct 2022 13:42:13 -0500 Subject: [PATCH 3/3] Update ci-win64.yml --- .github/workflows/ci-win64.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci-win64.yml b/.github/workflows/ci-win64.yml index 5c261545..f2522d2e 100644 --- a/.github/workflows/ci-win64.yml +++ b/.github/workflows/ci-win64.yml @@ -4,7 +4,7 @@ on: [push, pull_request] jobs: build: - runs-on: windows-latest + runs-on: windows-2019 steps: - name: Checkout