Icon with path works again

git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@2360 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
kichik 2003-03-26 14:37:20 +00:00
parent e73b4619be
commit 7fb39be4dc
2 changed files with 7 additions and 2 deletions

View file

@ -932,7 +932,7 @@ int createCfgDlg()
} else if (nType == FIELD_BITMAP || nType == FIELD_ICON) { } else if (nType == FIELD_BITMAP || nType == FIELD_ICON) {
WPARAM nImageType = nType == FIELD_BITMAP ? IMAGE_BITMAP : IMAGE_ICON; WPARAM nImageType = nType == FIELD_BITMAP ? IMAGE_BITMAP : IMAGE_ICON;
LPARAM nImage = 0; LPARAM nImage = 0;
if (nImageType == IMAGE_BITMAP) { if (pFields[nIdx].pszText) {
pFields[nIdx].hImage = LoadImage( pFields[nIdx].hImage = LoadImage(
0, 0,
pFields[nIdx].pszText, pFields[nIdx].pszText,
@ -1019,7 +1019,12 @@ void showCfgDlg()
FREE(pFields[nIdx].pszListItems); FREE(pFields[nIdx].pszListItems);
FREE(pFields[nIdx].pszFilter); FREE(pFields[nIdx].pszFilter);
FREE(pFields[nIdx].pszRoot); FREE(pFields[nIdx].pszRoot);
DeleteObject(pFields[nIdx].hImage); if (pFields[nIdx].nType == FIELD_BITMAP) {
DeleteObject(pFields[nIdx].hImage);
}
if (pFields[nIdx].nType == FIELD_ICON) {
DestroyIcon((HICON)pFields[nIdx].hImage);
}
} }
FREE(pFields); FREE(pFields);

Binary file not shown.