summaryrefslogtreecommitdiff
path: root/src/modules/clist
diff options
context:
space:
mode:
authorGeorge Hazan <george.hazan@gmail.com>2013-03-17 11:15:15 +0000
committerGeorge Hazan <george.hazan@gmail.com>2013-03-17 11:15:15 +0000
commit152da8847e828b132c5753ae5f58e8272556d4ef (patch)
tree7c96822b3ea2dee6257071d557259177c11da6f0 /src/modules/clist
parent79c0e81fbfd1f933a1e251db23dc1fd537ddd239 (diff)
some another leaks fixed
git-svn-id: http://svn.miranda-ng.org/main/trunk@4070 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'src/modules/clist')
-rw-r--r--src/modules/clist/clisttray.cpp10
1 files changed, 4 insertions, 6 deletions
diff --git a/src/modules/clist/clisttray.cpp b/src/modules/clist/clisttray.cpp
index 071e667e2e..6373b1a193 100644
--- a/src/modules/clist/clisttray.cpp
+++ b/src/modules/clist/clisttray.cpp
@@ -250,10 +250,10 @@ void fnTrayIconRemove(HWND hwnd, const char *szProto)
int fnTrayIconInit(HWND hwnd)
{
- int netProtoCount = 0;
initcheck 0;
lock;
+ int netProtoCount = 0;
int averageMode = GetAverageMode(&netProtoCount);
mToolTipTrayTips = ServiceExists("mToolTip/ShowTip") != 0;
@@ -310,16 +310,15 @@ int fnTrayIconInit(HWND hwnd)
int fnTrayIconDestroy(HWND hwnd)
{
- NOTIFYICONDATA nid = { SIZEOFNID };
- int i;
initcheck 0;
lock;
if (cli.trayIconCount == 1)
SetTaskBarIcon(NULL, NULL);
+ NOTIFYICONDATA nid = { SIZEOFNID };
nid.hWnd = hwnd;
- for (i=0; i < cli.trayIconCount; i++) {
+ for (int i=0; i < cli.trayIconCount; i++) {
if (cli.trayIcon[i].id == 0)
continue;
nid.uID = cli.trayIcon[i].id;
@@ -937,16 +936,15 @@ void fnUninitTray(void)
fTrayInited = FALSE;
DeleteCriticalSection(&trayLockCS);
}
+
void fnLockTray(void)
{
-// return; //stub to be removed
initcheck;
EnterCriticalSection(&trayLockCS);
}
void fnUnlockTray(void)
{
-// return; //stub to be removed
initcheck;
#ifdef _DEBUG
if (trayLockCS.RecursionCount == 0) DebugBreak(); //try to unlock already