diff options
author | George Hazan <george.hazan@gmail.com> | 2014-07-18 21:36:29 +0000 |
---|---|---|
committer | George Hazan <george.hazan@gmail.com> | 2014-07-18 21:36:29 +0000 |
commit | 5142c25982c01f602268f647749957bcf63f7380 (patch) | |
tree | 77b8088067baa66a823982deb1fda5ac3158b099 /plugins/TabSRMM | |
parent | 62b1f33833883602232b40799f4ca42444e5f928 (diff) |
some resource leaks fixed
git-svn-id: http://svn.miranda-ng.org/main/trunk@9855 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'plugins/TabSRMM')
-rw-r--r-- | plugins/TabSRMM/src/buttonsbar.cpp | 3 | ||||
-rw-r--r-- | plugins/TabSRMM/src/chat/main.cpp | 2 | ||||
-rw-r--r-- | plugins/TabSRMM/src/chat/window.cpp | 4 |
3 files changed, 6 insertions, 3 deletions
diff --git a/plugins/TabSRMM/src/buttonsbar.cpp b/plugins/TabSRMM/src/buttonsbar.cpp index 3f3fc59133..de867aad1e 100644 --- a/plugins/TabSRMM/src/buttonsbar.cpp +++ b/plugins/TabSRMM/src/buttonsbar.cpp @@ -45,6 +45,9 @@ void CB_InitCustomButtons() void CB_DeInitCustomButtons()
{
+ wipeList(LButtonsList);
+ wipeList(RButtonsList);
+
DestroyHookableEvent(hHookToolBarLoadedEvt);
DestroyHookableEvent(hHookButtonPressedEvt);
DestroyServiceFunction(hButtonsBarAddButton);
diff --git a/plugins/TabSRMM/src/chat/main.cpp b/plugins/TabSRMM/src/chat/main.cpp index d1cbacdd31..8d1bf58ffc 100644 --- a/plugins/TabSRMM/src/chat/main.cpp +++ b/plugins/TabSRMM/src/chat/main.cpp @@ -319,6 +319,8 @@ int Chat_Load() // unload the module. final cleanup
int Chat_Unload(void)
{
+ delete g_Settings.Highlight;
+
db_set_w(NULL, CHAT_MODULE, "SplitterX", (WORD)g_Settings.iSplitterX);
db_set_w(NULL, CHAT_MODULE, "splitY", (WORD)g_Settings.iSplitterY);
diff --git a/plugins/TabSRMM/src/chat/window.cpp b/plugins/TabSRMM/src/chat/window.cpp index 75fa4acf88..33da2d71cf 100644 --- a/plugins/TabSRMM/src/chat/window.cpp +++ b/plugins/TabSRMM/src/chat/window.cpp @@ -1063,7 +1063,6 @@ static LRESULT CALLBACK MessageSubclassProc(HWND hwnd, UINT msg, WPARAM wParam, case WM_DESTROY: mir_free(dat); - return 0; } return mir_callNextSubclass(hwnd, MessageSubclassProc, msg, wParam, lParam); @@ -1210,10 +1209,9 @@ static INT_PTR CALLBACK FilterWndProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LP */ static LRESULT CALLBACK ButtonSubclassProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) { - HWND hwndParent = GetParent(hwnd); - switch (msg) { case WM_RBUTTONUP: + HWND hwndParent = GetParent(hwnd); HWND hFilter = GetDlgItem(hwndParent, IDC_FILTER); HWND hColor = GetDlgItem(hwndParent, IDC_COLOR); HWND hBGColor = GetDlgItem(hwndParent, IDC_BKGCOLOR); |