- Don't delete icons that we got by WM_GETICON or GetClassIcon.

svn path=/trunk/; revision=9463
This commit is contained in:
Filip Navara 2004-05-22 08:35:38 +00:00
parent 4c8d47cc6b
commit 1c1f4e3945

View file

@ -319,13 +319,18 @@ BOOL CALLBACK TaskBar::EnumWndProc(HWND hwnd, LPARAM lparam)
} else {
HBITMAP hbmp;
HICON hIcon = get_window_icon_small(hwnd);
BOOL delete_icon = FALSE;
if (!hIcon)
{
hIcon = LoadIcon(0, IDI_APPLICATION);
delete_icon = TRUE;
}
if (hIcon) {
hbmp = create_bitmap_from_icon(hIcon, GetSysColorBrush(COLOR_BTNFACE), WindowCanvas(pThis->_htoolbar));
DestroyIcon(hIcon); // some icons can be freed, some not - so ignore any error return of DestroyIcon()
if (delete_icon)
DestroyIcon(hIcon); // some icons can be freed, some not - so ignore any error return of DestroyIcon()
} else
hbmp = 0;