Reverted 9623766

This commit is contained in:
Birunthan Mohanathas 2012-06-01 17:13:21 +03:00
parent 876fe7006a
commit 2336b08b88

View File

@ -426,9 +426,7 @@ std::wstring CMeasure::ExtractWord(std::wstring& buffer)
bool CMeasure::Update()
{
bool update = !IsDisabled();
if (update)
if (!m_Disabled)
{
// Only update the counter if the divider
++m_UpdateCounter;
@ -487,12 +485,6 @@ bool CMeasure::Update()
}
m_Value /= (double)averageValuesSize;
}
}
else
{
// Disabled measures have 0 as value
m_Value = 0.0;
}
if (m_MeterWindow)
{
@ -545,7 +537,14 @@ bool CMeasure::Update()
}
}
return update;
return true;
}
else
{
// Disabled measures have 0 as value
m_Value = 0.0;
return false;
}
}
/*