diff options
| -rw-r--r-- | plugins/AVS/src/services.cpp | 4 | ||||
| -rw-r--r-- | plugins/TabSRMM/src/msgdlgother.cpp | 8 |
2 files changed, 5 insertions, 7 deletions
diff --git a/plugins/AVS/src/services.cpp b/plugins/AVS/src/services.cpp index 2ef34d1901..198135ca3d 100644 --- a/plugins/AVS/src/services.cpp +++ b/plugins/AVS/src/services.cpp @@ -678,10 +678,10 @@ INT_PTR SetMyAvatar(WPARAM wParam, LPARAM lParam) INT_PTR CALLBACK DlgProcAvatarOptions(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam);
-static INT_PTR ContactOptions(WPARAM wParam, LPARAM)
+static INT_PTR ContactOptions(WPARAM wParam, LPARAM lParam)
{
if (wParam)
- CreateDialogParam(g_plugin.getInst(), MAKEINTRESOURCE(IDD_AVATAROPTIONS), nullptr, DlgProcAvatarOptions, (LPARAM)wParam);
+ CreateDialogParam(g_plugin.getInst(), MAKEINTRESOURCE(IDD_AVATAROPTIONS), (HWND)lParam, DlgProcAvatarOptions, wParam);
return 0;
}
diff --git a/plugins/TabSRMM/src/msgdlgother.cpp b/plugins/TabSRMM/src/msgdlgother.cpp index b47eb8bf92..d9edce60ae 100644 --- a/plugins/TabSRMM/src/msgdlgother.cpp +++ b/plugins/TabSRMM/src/msgdlgother.cpp @@ -1515,16 +1515,14 @@ int CMsgDialog::MsgWindowMenuHandler(int selection, int menuId) break; case ID_PICMENU_SETTINGS: - if (menuId == MENU_PANELPICMENU) - CallService(MS_AV_CONTACTOPTIONS, m_hContact, 0); - else if (menuId == MENU_PICMENU) { + if (menuId == MENU_PICMENU) { if (m_pPanel.isActive()) { if (ServiceExists(MS_AV_SETMYAVATARW) && CallService(MS_AV_CANSETMYAVATAR, (WPARAM)(m_cache->getActiveProto()), 0)) CallService(MS_AV_SETMYAVATARW, (WPARAM)(m_cache->getActiveProto()), 0); + return TRUE; } - else - CallService(MS_AV_CONTACTOPTIONS, m_hContact, 0); } + CallService(MS_AV_CONTACTOPTIONS, m_hContact, (LPARAM)m_hwnd); return 1; } } |