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

Fix crash caused by 04090b2

Browse Source
This commit is contained in:
Birunthan Mohanathas 2013-06-14 16:58:42 +03:00
parent 1847e89b8e
commit 9a62ebef95
2 changed files with 32 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
Library/Rainmeter.cpp
View File

@ -99,6 +99,7 @@ int RainmeterMain(LPWSTR cmdLine)
{ {
ret = rainmeter.MessagePump(); ret = rainmeter.MessagePump();
} }
rainmeter.Finalize();
return ret; return ret;
} }
@ -143,32 +144,6 @@ Rainmeter::Rainmeter() :
*/ */
Rainmeter::~Rainmeter() Rainmeter::~Rainmeter()
{ {
KillTimer(m_Window, TIMER_NETSTATS);
DeleteAllUnmanagedMeterWindows();
DeleteAllMeterWindows();
delete m_TrayWindow;
System::Finalize();
MeasureNet::UpdateIFTable();
MeasureNet::UpdateStats();
WriteStats(true);
MeasureNet::FinalizeStatic();
MeasureCPU::FinalizeStatic();
MeterString::FinalizeStatic();
// Change the work area back
if (m_DesktopWorkAreaChanged)
{
UpdateDesktopWorkArea(true);
}
if (m_ResourceInstance) FreeLibrary(m_ResourceInstance);
if (m_Mutex) ReleaseMutex(m_Mutex);
CoUninitialize(); CoUninitialize();
GdiplusShutdown(m_GDIplusToken); GdiplusShutdown(m_GDIplusToken);
@ -441,6 +416,35 @@ int Rainmeter::Initialize(LPCWSTR iniPath, LPCWSTR layout)
return 0; // All is OK return 0; // All is OK
} }
void Rainmeter::Finalize()
{
KillTimer(m_Window, TIMER_NETSTATS);
DeleteAllUnmanagedMeterWindows();
DeleteAllMeterWindows();
delete m_TrayWindow;
System::Finalize();
MeasureNet::UpdateIFTable();
MeasureNet::UpdateStats();
WriteStats(true);
MeasureNet::FinalizeStatic();
MeasureCPU::FinalizeStatic();
MeterString::FinalizeStatic();
// Change the work area back
if (m_DesktopWorkAreaChanged)
{
UpdateDesktopWorkArea(true);
}
if (m_ResourceInstance) FreeLibrary(m_ResourceInstance);
if (m_Mutex) ReleaseMutex(m_Mutex);
}
bool Rainmeter::IsAlreadyRunning() bool Rainmeter::IsAlreadyRunning()
{ {
typedef struct typedef struct

2
Library/Rainmeter.h
View File

@ -93,6 +93,8 @@ public:
static Rainmeter& GetInstance(); static Rainmeter& GetInstance();
int Initialize(LPCWSTR iniPath, LPCWSTR layout); int Initialize(LPCWSTR iniPath, LPCWSTR layout);
void Finalize();
bool IsAlreadyRunning(); bool IsAlreadyRunning();
int MessagePump(); int MessagePump();