summaryrefslogtreecommitdiff
path: root/plugins/NewAwaySysMod/src/SetAwayMsg.cpp
diff options
context:
space:
mode:
authorGeorge Hazan <george.hazan@gmail.com>2015-07-27 11:00:02 +0000
committerGeorge Hazan <george.hazan@gmail.com>2015-07-27 11:00:02 +0000
commit0d289371985e2d099b0de6b8150dbb74fb416e43 (patch)
tree6f458445f16db7331d3e7e64e2c0ca5685db2d31 /plugins/NewAwaySysMod/src/SetAwayMsg.cpp
parent3412f466bdafa84485bb35c6913c309d315d6a4e (diff)
fix for a crash when a pointer gets converted to int
git-svn-id: http://svn.miranda-ng.org/main/trunk@14737 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'plugins/NewAwaySysMod/src/SetAwayMsg.cpp')
-rw-r--r--plugins/NewAwaySysMod/src/SetAwayMsg.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/plugins/NewAwaySysMod/src/SetAwayMsg.cpp b/plugins/NewAwaySysMod/src/SetAwayMsg.cpp
index fdceb93f39..6d0f2ae624 100644
--- a/plugins/NewAwaySysMod/src/SetAwayMsg.cpp
+++ b/plugins/NewAwaySysMod/src/SetAwayMsg.cpp
@@ -217,9 +217,9 @@ int SetAwayMsgDlgResize(HWND, LPARAM lParam, UTILRESIZECONTROL *urc)
return RD_ANCHORX_LEFT | RD_ANCHORY_BOTTOM;
}
-__inline int DBValueToReplyIcon(int Value)
+__inline int DBValueToReplyIcon(int m_value)
{
- switch (Value) {
+ switch (m_value) {
case VAL_USEDEFAULT: return EXTRAIMGLIST_DOT;
case 0: return EXTRAIMGLIST_AUTOREPLY_OFF;
default: return EXTRAIMGLIST_AUTOREPLY_ON;
@@ -452,7 +452,7 @@ static Buttons[] =
};
struct {
- int DlgItemID;
+ int m_dlgItemID;
TCHAR* Text;
} Tooltips[] = {
IDC_SAWAYMSG_IGNOREREQ, LPGENT("Don't send the status message to selected contact(s)"),
@@ -612,7 +612,7 @@ INT_PTR CALLBACK SetAwayMsgDlgProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARA
ti.cbSize = sizeof(ti);
ti.uFlags = TTF_IDISHWND | TTF_SUBCLASS;
for (int i = 0; i < _countof(Tooltips); i++) {
- ti.uId = (UINT_PTR)GetDlgItem(hwndDlg, Tooltips[i].DlgItemID);
+ ti.uId = (UINT_PTR)GetDlgItem(hwndDlg, Tooltips[i].m_dlgItemID);
ti.lpszText = TranslateTS(Tooltips[i].Text);
SendMessage(hWndTooltips, TTM_ADDTOOL, 0, (LPARAM)&ti);
}
@@ -711,8 +711,8 @@ INT_PTR CALLBACK SetAwayMsgDlgProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARA
bool StatusDetermined = false;
for (int i = 0; i < pnm->NewSelection->GetSize(); i++) {
HTREEITEM hItem = (*pnm->NewSelection)[i];
- MCONTACT hContact;
- char *szProto;
+ MCONTACT hContact = 0;
+ char *szProto = NULL;
int ItemType = CList->GetItemType(hItem);
if (ItemType == MCLCIT_CONTACT) {
hContact = CList->GethContact(hItem);