Fixed that IfAction state is not reset after disabling since 4a8bc1b

This commit is contained in:
Birunthan Mohanathas 2012-06-03 12:53:01 +03:00
parent fa099665a3
commit f2a494b675
2 changed files with 23 additions and 1 deletions

View File

@ -547,6 +547,28 @@ bool CMeasure::Update()
} }
} }
void CMeasure::Disable()
{
m_Disabled = true;
// IfActions are not checked when disabled, so set committed state to false if
// condition is not met with value = 0
if ((int)m_IfEqualValue != 0)
{
m_IfEqualCommitted = false;
}
if (m_IfAboveValue <= 0.0)
{
m_IfAboveCommitted = false;
}
if (m_IfBelowValue >= 0.0)
{
m_IfBelowCommitted = false;
}
}
/* /*
** Returns the value of the measure. ** Returns the value of the measure.
** **

View File

@ -57,7 +57,7 @@ public:
const WCHAR* GetName() { return m_Name.c_str(); } const WCHAR* GetName() { return m_Name.c_str(); }
const std::wstring& GetOriginalName() { return m_Name; } const std::wstring& GetOriginalName() { return m_Name; }
void Disable() { m_Disabled = true; } void Disable();
void Enable() { m_Disabled = false; } void Enable() { m_Disabled = false; }
bool IsDisabled() { return m_Disabled; } bool IsDisabled() { return m_Disabled; }