Fixed a problem that "Random" is case-sensitive in CALC measure.

Fixed a problem that a deletion of the meter window encounters enormous delays when the meter window has enormous Update=.

Some small cosmetics.
This commit is contained in:
spx
2010-04-08 23:16:43 +00:00
parent 54fe29a062
commit 32db892e2c
5 changed files with 42 additions and 24 deletions

View File

@ -1341,7 +1341,6 @@ void CRainmeter::ClearDeleteLaterList()
while (!m_DelayDeleteList.empty())
{
CMeterWindow* meterWindow = m_DelayDeleteList.front();
delete meterWindow;
// Remove from the delete later list
m_DelayDeleteList.remove(meterWindow);
@ -1356,6 +1355,8 @@ void CRainmeter::ClearDeleteLaterList()
break;
}
}
delete meterWindow;
}
}
@ -1382,8 +1383,8 @@ bool CRainmeter::DeleteMeterWindow(CMeterWindow* meterWindow, bool bLater)
}
else if ((*iter).second == meterWindow)
{
delete meterWindow;
m_Meters.erase(iter);
delete meterWindow;
return true;
}
}