mirror of
https://github.com/chibicitiberiu/rainmeter-studio.git
synced 2024-02-24 04:33:31 +00:00
Image and button meters don't ignore errors anymore if they are bound to a non-existing measure.
This commit is contained in:
parent
a588a86b3b
commit
ace2a67049
@ -242,19 +242,16 @@ bool CMeterButton::Draw()
|
|||||||
/*
|
/*
|
||||||
** BindMeasure
|
** BindMeasure
|
||||||
**
|
**
|
||||||
** Overridden method. The Image meters need not to be bound on anything
|
** Overridden method. The meters need not to be bound on anything
|
||||||
**
|
**
|
||||||
*/
|
*/
|
||||||
void CMeterButton::BindMeasure(std::list<CMeasure*>& measures)
|
void CMeterButton::BindMeasure(std::list<CMeasure*>& measures)
|
||||||
{
|
{
|
||||||
try
|
// It's ok not to bind meter to anything
|
||||||
|
if (!m_MeasureName.empty())
|
||||||
{
|
{
|
||||||
CMeter::BindMeasure(measures);
|
CMeter::BindMeasure(measures);
|
||||||
}
|
}
|
||||||
catch(CError)
|
|
||||||
{
|
|
||||||
// Do nothing (ignore errors)
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
bool CMeterButton::MouseUp(POINT pos, CMeterWindow* window)
|
bool CMeterButton::MouseUp(POINT pos, CMeterWindow* window)
|
||||||
|
@ -257,13 +257,10 @@ bool CMeterImage::Draw()
|
|||||||
*/
|
*/
|
||||||
void CMeterImage::BindMeasure(std::list<CMeasure*>& measures)
|
void CMeterImage::BindMeasure(std::list<CMeasure*>& measures)
|
||||||
{
|
{
|
||||||
try
|
// It's ok not to bind image meter to anything
|
||||||
|
if (!m_MeasureName.empty())
|
||||||
{
|
{
|
||||||
CMeter::BindMeasure(measures);
|
CMeter::BindMeasure(measures);
|
||||||
}
|
}
|
||||||
catch(CError)
|
|
||||||
{
|
|
||||||
// Do nothing (ignore errors)
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user