summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Mat M2019-03-02 14:46:04 -0500
committerGravatar GitHub2019-03-02 14:46:04 -0500
commit169d19f7b94323341487e029f9765d8b47b062b4 (patch)
tree9616083ca561d198edec9e03fefaef6e5681b74c
parentMerge pull request #2183 from ReinUsesLisp/vk-buffer-cache-clang (diff)
parentcitra_qt/main: make SPEED_LIMIT_STEP static constexpr (diff)
downloadyuzu-169d19f7b94323341487e029f9765d8b47b062b4.tar.gz
yuzu-169d19f7b94323341487e029f9765d8b47b062b4.tar.xz
yuzu-169d19f7b94323341487e029f9765d8b47b062b4.zip
Merge pull request #2154 from FearlessTobi/port-4647
Port citra-emu/citra#4647: "citra_qt/main: make SPEED_LIMIT_STEP static constexpr"
-rw-r--r--src/yuzu/main.cpp5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/yuzu/main.cpp b/src/yuzu/main.cpp
index 1d460c189..5ab7896d4 100644
--- a/src/yuzu/main.cpp
+++ b/src/yuzu/main.cpp
@@ -561,7 +561,10 @@ void GMainWindow::InitializeHotkeys() {
561 Settings::values.use_frame_limit = !Settings::values.use_frame_limit; 561 Settings::values.use_frame_limit = !Settings::values.use_frame_limit;
562 UpdateStatusBar(); 562 UpdateStatusBar();
563 }); 563 });
564 constexpr u16 SPEED_LIMIT_STEP = 5; 564 // TODO: Remove this comment/static whenever the next major release of
565 // MSVC occurs and we make it a requirement (see:
566 // https://developercommunity.visualstudio.com/content/problem/93922/constexprs-are-trying-to-be-captured-in-lambda-fun.html)
567 static constexpr u16 SPEED_LIMIT_STEP = 5;
565 connect(hotkey_registry.GetHotkey("Main Window", "Increase Speed Limit", this), 568 connect(hotkey_registry.GetHotkey("Main Window", "Increase Speed Limit", this),
566 &QShortcut::activated, this, [&] { 569 &QShortcut::activated, this, [&] {
567 if (Settings::values.frame_limit < 9999 - SPEED_LIMIT_STEP) { 570 if (Settings::values.frame_limit < 9999 - SPEED_LIMIT_STEP) {