Qt: Fix FF/turbo speed resetting in game properties

pull/3326/head
Stenzek 4 months ago
parent 9733d8a0d1
commit b4e509d090
No known key found for this signature in database

@ -1737,7 +1737,7 @@ void SPU::VolumeEnvelope::Reset(u8 rate_, u8 rate_mask_, bool decreasing_, bool
counter_increment >>= ((rate >> 2) - 11); counter_increment >>= ((rate >> 2) - 11);
// Rate of 0x7F (or more specifically all bits set, for decay/release) is a special case that never ticks. // 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); counter_increment = std::max<u16>(counter_increment, 1u);
} }
} }

@ -48,7 +48,7 @@ EmulationSettingsWidget::EmulationSettingsWidget(SettingsWindow* dialog, QWidget
fillComboBoxWithEmulationSpeeds(m_ui.fastForwardSpeed, effective_fast_forward_speed); fillComboBoxWithEmulationSpeeds(m_ui.fastForwardSpeed, effective_fast_forward_speed);
if (m_dialog->isPerGameSettings() && !m_dialog->getFloatValue("Main", "FastForwardSpeed", std::nullopt).has_value()) if (m_dialog->isPerGameSettings() && !m_dialog->getFloatValue("Main", "FastForwardSpeed", std::nullopt).has_value())
{ {
m_ui.emulationSpeed->setCurrentIndex(0); m_ui.fastForwardSpeed->setCurrentIndex(0);
} }
else else
{ {
@ -63,7 +63,7 @@ EmulationSettingsWidget::EmulationSettingsWidget(SettingsWindow* dialog, QWidget
fillComboBoxWithEmulationSpeeds(m_ui.turboSpeed, effective_turbo_speed); fillComboBoxWithEmulationSpeeds(m_ui.turboSpeed, effective_turbo_speed);
if (m_dialog->isPerGameSettings() && !m_dialog->getFloatValue("Main", "TurboSpeed", std::nullopt).has_value()) if (m_dialog->isPerGameSettings() && !m_dialog->getFloatValue("Main", "TurboSpeed", std::nullopt).has_value())
{ {
m_ui.emulationSpeed->setCurrentIndex(0); m_ui.turboSpeed->setCurrentIndex(0);
} }
else else
{ {

Loading…
Cancel
Save