From b4e509d0902cd5c79bb86e91070f139e47bbfda6 Mon Sep 17 00:00:00 2001
From: Stenzek <stenzek@gmail.com>
Date: Sat, 2 Nov 2024 21:20:19 +1000
Subject: [PATCH] Qt: Fix FF/turbo speed resetting in game properties

---
 src/core/spu.cpp                               | 2 +-
 src/duckstation-qt/emulationsettingswidget.cpp | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/core/spu.cpp b/src/core/spu.cpp
index 3a323259c..b6b147cdd 100644
--- a/src/core/spu.cpp
+++ b/src/core/spu.cpp
@@ -1737,7 +1737,7 @@ void SPU::VolumeEnvelope::Reset(u8 rate_, u8 rate_mask_, bool decreasing_, bool
     counter_increment >>= ((rate >> 2) - 11);
 
     // Rate of 0x7F (or more specifically all bits set, for decay/release) is a special case that never ticks.
-    if ((rate_ & rate_mask_) != rate_mask_)
+    if ((rate & rate_mask_) != rate_mask_)
       counter_increment = std::max<u16>(counter_increment, 1u);
   }
 }
diff --git a/src/duckstation-qt/emulationsettingswidget.cpp b/src/duckstation-qt/emulationsettingswidget.cpp
index 32a829b0f..85de0269b 100644
--- a/src/duckstation-qt/emulationsettingswidget.cpp
+++ b/src/duckstation-qt/emulationsettingswidget.cpp
@@ -48,7 +48,7 @@ EmulationSettingsWidget::EmulationSettingsWidget(SettingsWindow* dialog, QWidget
   fillComboBoxWithEmulationSpeeds(m_ui.fastForwardSpeed, effective_fast_forward_speed);
   if (m_dialog->isPerGameSettings() && !m_dialog->getFloatValue("Main", "FastForwardSpeed", std::nullopt).has_value())
   {
-    m_ui.emulationSpeed->setCurrentIndex(0);
+    m_ui.fastForwardSpeed->setCurrentIndex(0);
   }
   else
   {
@@ -63,7 +63,7 @@ EmulationSettingsWidget::EmulationSettingsWidget(SettingsWindow* dialog, QWidget
   fillComboBoxWithEmulationSpeeds(m_ui.turboSpeed, effective_turbo_speed);
   if (m_dialog->isPerGameSettings() && !m_dialog->getFloatValue("Main", "TurboSpeed", std::nullopt).has_value())
   {
-    m_ui.emulationSpeed->setCurrentIndex(0);
+    m_ui.turboSpeed->setCurrentIndex(0);
   }
   else
   {