From ec9c2ef59824cff951b623bdd61d4f925584de61 Mon Sep 17 00:00:00 2001 From: Birunthan Mohanathas Date: Sun, 8 Dec 2013 13:44:03 +0200 Subject: [PATCH] Reapply accidentally reverted changes in 3b1dfba --- Library/MeasureCalc.cpp | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/Library/MeasureCalc.cpp b/Library/MeasureCalc.cpp index c712f1f8..ec0b79a4 100644 --- a/Library/MeasureCalc.cpp +++ b/Library/MeasureCalc.cpp @@ -103,12 +103,11 @@ void MeasureCalc::ReadOptions(ConfigParser& parser, const WCHAR* section) oldUpdateRandom != m_UpdateRandom || oldUniqueRandom != m_UniqueRandom) { - // Reset bounds if |m_LowBound| is greater than |m_HighBound| - if (m_LowBound > m_HighBound) + // Reset bounds if |m_LowBound| is greater than |m_HighBound|. + if (m_LowBound > m_HighBound && + (oldLowBound != m_LowBound || oldHighBound != m_HighBound)) { LogErrorF(this, L"\"LowBound\" (%i) must be less then or equal to \"HighBound\" (%i)", m_LowBound, m_HighBound); - - m_HighBound = m_LowBound; } // Reset the list if the bounds are changed @@ -199,7 +198,7 @@ bool MeasureCalc::GetMeasureValue(const WCHAR* str, int len, double* value, void int MeasureCalc::GetRandom() { - if (m_LowBound == m_HighBound) + if (m_LowBound == m_HighBound || m_LowBound > m_HighBound) { return m_LowBound; }