From e3dabb7f0a22c6442dde5f261d3414f9e7369592 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Fri, 9 Sep 2011 23:11:23 +0300 Subject: Last fix part of shadow variables/methods errors. --- src/gui/setup_video.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'src/gui/setup_video.cpp') diff --git a/src/gui/setup_video.cpp b/src/gui/setup_video.cpp index bc210075a..e0f03ec60 100644 --- a/src/gui/setup_video.cpp +++ b/src/gui/setup_video.cpp @@ -687,12 +687,12 @@ void Setup_Video::action(const gcn::ActionEvent &event) } else if (id == "fpslimitcheckbox" || id == "fpslimitslider") { - int fps = static_cast(mFpsSlider->getValue()); + int tempFps = static_cast(mFpsSlider->getValue()); if (id == "fpslimitcheckbox" && !mFpsSlider->isEnabled()) - fps = 60; + tempFps = 60; else - fps = fps > 0 ? fps : 60; - mFps = mFpsCheckBox->isSelected() ? fps : 0; + tempFps = tempFps > 0 ? tempFps : 60; + mFps = mFpsCheckBox->isSelected() ? tempFps : 0; const std::string text = mFps > 0 ? toString(mFps) : _("None"); mFpsLabel->setCaption(text); @@ -701,9 +701,9 @@ void Setup_Video::action(const gcn::ActionEvent &event) } else if (id == "altfpslimitslider") { - int fps = static_cast(mAltFpsSlider->getValue()); - fps = fps > 0 ? fps : static_cast(mAltFpsSlider->getScaleStart()); - mAltFps = fps; + int tempFps = static_cast(mAltFpsSlider->getValue()); + tempFps = tempFps > 0 ? tempFps : static_cast(mAltFpsSlider->getScaleStart()); + mAltFps = tempFps; const std::string text = mAltFps > 0 ? toString(mAltFps) : _("None"); mAltFpsLabel->setCaption(_("Alt FPS limit: ") + text); -- cgit v1.2.3-60-g2f50