Additional changes to af8befd: Fixed that unloaded skin is not deleted properly in rare case.

This commit is contained in:
spx
2013-03-11 06:06:02 +09:00
parent 27fe4a1e1c
commit 6ad5d56498
3 changed files with 49 additions and 2 deletions

View File

@@ -394,6 +394,7 @@ void CMeterWindow::Deactivate()
m_State = STATE_CLOSING;
Rainmeter->RemoveMeterWindow(this);
Rainmeter->AddUnmanagedMeterWindow(this);
HideFade();
SetTimer(m_Window, TIMER_DEACTIVATE, m_FadeDuration + 50, NULL);
@@ -2887,6 +2888,7 @@ LRESULT CMeterWindow::OnTimer(UINT uMsg, WPARAM wParam, LPARAM lParam)
if (m_FadeStartTime == 0)
{
KillTimer(m_Window, TIMER_DEACTIVATE);
Rainmeter->RemoveUnmanagedMeterWindow(this);
delete this;
}
break;