From 3d3e230abad4846ecfbe9aecb14cfcfd94a4d854 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Sun, 2 Jun 2019 16:04:56 +0300 Subject: fixes #1974 (Jabber: buttons' icons disappear after clicking Ok) --- src/mir_app/src/skinicons.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/mir_app/src/skinicons.cpp b/src/mir_app/src/skinicons.cpp index 73e4e6fb7e..b5ecd34c88 100644 --- a/src/mir_app/src/skinicons.cpp +++ b/src/mir_app/src/skinicons.cpp @@ -208,7 +208,8 @@ MIR_APP_DLL(void) Button_SetSkin_IcoLib(HWND hwndDlg, int itemId, int iconId, co HWND hWnd = GetDlgItem(hwndDlg, itemId); SendMessage(hWnd, BM_SETIMAGE, IMAGE_ICON, (LPARAM)Skin_LoadIcon(iconId, false)); SendMessage(hWnd, BUTTONSETASFLATBTN, TRUE, 0); - SendMessage(hWnd, BUTTONADDTOOLTIP, (WPARAM)tooltip, 0); + if (tooltip) + SendMessage(hWnd, BUTTONADDTOOLTIP, (WPARAM)tooltip, 0); } MIR_APP_DLL(void) Button_SetIcon_IcoLib(HWND hwndDlg, int itemId, HANDLE hIcolib, const char *tooltip) @@ -216,7 +217,8 @@ MIR_APP_DLL(void) Button_SetIcon_IcoLib(HWND hwndDlg, int itemId, HANDLE hIcolib HWND hWnd = GetDlgItem(hwndDlg, itemId); SendMessage(hWnd, BM_SETIMAGE, IMAGE_ICON, (LPARAM)IcoLib_GetIconByHandle(hIcolib, false)); SendMessage(hWnd, BUTTONSETASFLATBTN, TRUE, 0); - SendMessage(hWnd, BUTTONADDTOOLTIP, (WPARAM)tooltip, 0); + if (tooltip) + SendMessage(hWnd, BUTTONADDTOOLTIP, (WPARAM)tooltip, 0); } MIR_APP_DLL(void) Button_FreeIcon_IcoLib(HWND hwndDlg, int itemId) -- cgit v1.2.3