Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-06 05:53:05 +00:00
Code Issues Projects Releases Packages Wiki Activity

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

Browse source 
svn path=/trunk/; revision=9463
This commit is contained in:
Filip Navara 2004-05-22 08:35:38 +00:00
parent 4c8d47cc6b
commit 1c1f4e3945
1 changed files with 6 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

7
reactos/subsys/system/explorer/taskbar/taskbar.cpp
View file

@ -319,13 +319,18 @@ BOOL CALLBACK TaskBar::EnumWndProc(HWND hwnd, LPARAM lparam)
} else { } else {
HBITMAP hbmp; HBITMAP hbmp;
HICON hIcon = get_window_icon_small(hwnd); HICON hIcon = get_window_icon_small(hwnd);
BOOL delete_icon = FALSE;
if (!hIcon) if (!hIcon)
{
hIcon = LoadIcon(0, IDI_APPLICATION); hIcon = LoadIcon(0, IDI_APPLICATION);
delete_icon = TRUE;
}
if (hIcon) { if (hIcon) {
hbmp = create_bitmap_from_icon(hIcon, GetSysColorBrush(COLOR_BTNFACE), WindowCanvas(pThis->_htoolbar)); 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 } else
hbmp = 0; hbmp = 0;