summaryrefslogtreecommitdiff
path: root/plugins/Clist_nicer/src/CLUIFrames/cluiframes.cpp
diff options
context:
space:
mode:
authorGeorge Hazan <george.hazan@gmail.com>2013-10-24 15:21:30 +0000
committerGeorge Hazan <george.hazan@gmail.com>2013-10-24 15:21:30 +0000
commit5e01c907bf4cace9542f880bae418f71c0fd0c07 (patch)
tree4e8b60aa99bcc10540be4b0ca09bcb313ff78677 /plugins/Clist_nicer/src/CLUIFrames/cluiframes.cpp
parent4a4b816398add26a704f13af1aa2ff5023df01af (diff)
more warning fixes
git-svn-id: http://svn.miranda-ng.org/main/trunk@6608 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'plugins/Clist_nicer/src/CLUIFrames/cluiframes.cpp')
-rw-r--r--plugins/Clist_nicer/src/CLUIFrames/cluiframes.cpp10
1 files changed, 3 insertions, 7 deletions
diff --git a/plugins/Clist_nicer/src/CLUIFrames/cluiframes.cpp b/plugins/Clist_nicer/src/CLUIFrames/cluiframes.cpp
index ed66938009..b0acb8a6e8 100644
--- a/plugins/Clist_nicer/src/CLUIFrames/cluiframes.cpp
+++ b/plugins/Clist_nicer/src/CLUIFrames/cluiframes.cpp
@@ -584,9 +584,6 @@ int CLUIFramesGetalClientFrame(void)
if (FramesSysNotStarted)
return -1;
- if (alclientFrame != -1)
- return alclientFrame;
-
if (alclientFrame != -1) {
/* this value could become invalid if RemoveItemFromList was called,
* so we double-check */
@@ -2822,7 +2819,7 @@ LRESULT CALLBACK CLUIFrameTitleBarProc(HWND hwnd, UINT msg, WPARAM wParam, LPARA
}
ulockfrm();
}
- if (wParam & MK_LBUTTON) {
+ if (wParam & MK_RBUTTON) {
int newh = -1, prevold;
if (GetCapture() != hwnd)
@@ -3141,7 +3138,7 @@ INT_PTR CLUIFrameSetFloat(WPARAM wParam, LPARAM lParam)
lockfrm();
wParam = id2pos((INT_PTR)wParam);
- if (wParam >= 0 && (int)wParam < nFramescount) {
+ if ((int)wParam >= 0 && (int)wParam < nFramescount) {
if (Frames[wParam].floating) {
SetParent(Frames[wParam].hWnd, pcli->hwndContactList);
SetParent(Frames[wParam].TitleBar.hwnd, pcli->hwndContactList);
@@ -3370,8 +3367,7 @@ int UnLoadCLUIFramesModule(void)
if (Frames[i].TitleBar.tbname != NULL)
mir_free(Frames[i].TitleBar.tbname);
}
- if (Frames)
- free(Frames);
+ free(Frames);
Frames = NULL;
nFramescount = 0;
UnregisterClass(CLUIFrameTitleBarClassName, g_hInst);