From 904ddbf2a35cbd839cde9249d9f2e9d2ff9c158d Mon Sep 17 00:00:00 2001 From: Paul Licameli Date: Fri, 21 Jul 2017 22:13:15 -0400 Subject: [PATCH] Bug1684: Fix misbehaving slider in Change Speed effect... ... which was introduced at d9f7b3605f80bd7bba2236befd57ba21a64b996e --- src/effects/ChangeSpeed.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/effects/ChangeSpeed.cpp b/src/effects/ChangeSpeed.cpp index 78fed4e4e..92ae97eff 100644 --- a/src/effects/ChangeSpeed.cpp +++ b/src/effects/ChangeSpeed.cpp @@ -698,14 +698,14 @@ void EffectChangeSpeed::Update_Text_Multiplier() void EffectChangeSpeed::Update_Slider_PercentChange() // Update Slider Percent control from percent change. { - double unwarped = m_PercentChange; + auto unwarped = std::min(m_PercentChange, MAX_Percentage); if (unwarped > 0.0) // Un-warp values above zero to actually go up to kSliderMax. unwarped = pow(m_PercentChange, (1.0 / kSliderWarp)); // Caution: m_PercentChange could be infinite. int unwarpedi = (int)(unwarped + 0.5); - unwarpedi = std::min(std::max(unwarpedi, (int)kSliderMax), (int)MAX_Percentage); + unwarpedi = std::min(unwarpedi, (int)kSliderMax); mpSlider_PercentChange->SetValue(unwarpedi); }