chibicitiberiu/rainmeter-studio
1
0
Fork 0
mirror of https://github.com/chibicitiberiu/rainmeter-studio.git synced 2024-02-24 04:33:31 +00:00
Code Issues Releases Wiki Activity

Fixed crash when group bang is executed on exiting Rainmeter

Browse Source
This commit is contained in:
spx 2013-06-04 05:58:30 +09:00
parent 68dce478d5
commit 7849b2a6e1
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Library/Rainmeter.cpp
View File

@ -955,10 +955,14 @@ void Rainmeter::CreateMeterWindow(const std::wstring& folderPath, const std::wst
void Rainmeter::DeleteAllMeterWindows() void Rainmeter::DeleteAllMeterWindows()
{ {
for (auto it = m_MeterWindows.cbegin(); it != m_MeterWindows.end(); ++it) auto it = m_MeterWindows.cbegin();
while (it != m_MeterWindows.cend())
{ {
DialogManage::UpdateSkins((*it).second, true); MeterWindow* mw = (*it).second;
delete (*it).second; m_MeterWindows.erase(it++); // Remove before deleting MeterWindow
DialogManage::UpdateSkins(mw, true);
delete mw;
} }
m_MeterWindows.clear(); m_MeterWindows.clear();
@ -967,7 +971,7 @@ void Rainmeter::DeleteAllMeterWindows()
void Rainmeter::DeleteAllUnmanagedMeterWindows() void Rainmeter::DeleteAllUnmanagedMeterWindows()
{ {
for (auto it = m_UnmanagedMeterWindows.cbegin(); it != m_UnmanagedMeterWindows.end(); ++it) for (auto it = m_UnmanagedMeterWindows.cbegin(); it != m_UnmanagedMeterWindows.cend(); ++it)
{ {
delete (*it); delete (*it);
} }
@ -981,7 +985,7 @@ void Rainmeter::DeleteAllUnmanagedMeterWindows()
*/ */
void Rainmeter::RemoveMeterWindow(MeterWindow* meterWindow) void Rainmeter::RemoveMeterWindow(MeterWindow* meterWindow)
{ {
for (auto it = m_MeterWindows.cbegin(); it != m_MeterWindows.end(); ++it) for (auto it = m_MeterWindows.cbegin(); it != m_MeterWindows.cend(); ++it)
{ {
if ((*it).second == meterWindow) if ((*it).second == meterWindow)
{ {