From 7fb39be4dc7096984775b7303c49ede783cd2a11 Mon Sep 17 00:00:00 2001 From: kichik Date: Wed, 26 Mar 2003 14:37:20 +0000 Subject: [PATCH] Icon with path works again git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@2360 212acab6-be3b-0410-9dea-997c60f758d6 --- Contrib/InstallOptions/InstallerOptions.cpp | 9 +++++++-- Plugins/InstallOptions.dll | Bin 12800 -> 12800 bytes 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/Contrib/InstallOptions/InstallerOptions.cpp b/Contrib/InstallOptions/InstallerOptions.cpp index 7b038082..44766f3c 100644 --- a/Contrib/InstallOptions/InstallerOptions.cpp +++ b/Contrib/InstallOptions/InstallerOptions.cpp @@ -932,7 +932,7 @@ int createCfgDlg() } else if (nType == FIELD_BITMAP || nType == FIELD_ICON) { WPARAM nImageType = nType == FIELD_BITMAP ? IMAGE_BITMAP : IMAGE_ICON; LPARAM nImage = 0; - if (nImageType == IMAGE_BITMAP) { + if (pFields[nIdx].pszText) { pFields[nIdx].hImage = LoadImage( 0, pFields[nIdx].pszText, @@ -1019,7 +1019,12 @@ void showCfgDlg() FREE(pFields[nIdx].pszListItems); FREE(pFields[nIdx].pszFilter); 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); diff --git a/Plugins/InstallOptions.dll b/Plugins/InstallOptions.dll index 0b9ab614159b92d55da0a0a7be2130ac8132aa89..8602a0cdfb85d61a5159b93a6d97fb0973e3ddcd 100644 GIT binary patch delta 4186 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 Q$Wj?j7@FpayPKl^1yIaz{Qv*} delta 4180 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