mirror of
				https://github.com/chibicitiberiu/rainmeter-studio.git
				synced 2024-02-24 04:33:31 +00:00 
			
		
		
		
	Fixed that IfAction state is not reset after disabling since 4a8bc1b
				
					
				
			This commit is contained in:
		@@ -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.
 | 
				
			||||||
**
 | 
					**
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -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; }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user