Icon now supports the res:// protocol
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@7328 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
parent
cc431158fd
commit
167e53df8a
6 changed files with 266 additions and 127 deletions
|
@ -1333,7 +1333,7 @@ int CEXEBuild::doCommand(int which_token, LineParser &line)
|
|||
SCRIPT_MSG(_T("Icon: \"%") NPRIs _T("\"\n"),line.gettoken_str(1));
|
||||
try {
|
||||
free_loaded_icon(installer_icon);
|
||||
installer_icon = load_icon_file(line.gettoken_str(1));
|
||||
installer_icon = load_icon(line.gettoken_str(1));
|
||||
}
|
||||
catch (exception& err) {
|
||||
ERROR_MSG(_T("Error while loading icon from \"%") NPRIs _T("\": %") NPRIs _T("\n"), line.gettoken_str(1), CtoTStrParam(err.what()));
|
||||
|
@ -2593,7 +2593,7 @@ int CEXEBuild::doCommand(int which_token, LineParser &line)
|
|||
SCRIPT_MSG(_T("UninstallIcon: \"%") NPRIs _T("\"\n"),line.gettoken_str(1));
|
||||
try {
|
||||
free_loaded_icon(uninstaller_icon);
|
||||
uninstaller_icon = load_icon_file(line.gettoken_str(1));
|
||||
uninstaller_icon = load_icon(line.gettoken_str(1));
|
||||
}
|
||||
catch (exception& err) {
|
||||
ERROR_MSG(_T("Error while loading icon from \"%") NPRIs _T("\": %") NPRIs _T("\n"), line.gettoken_str(1), CtoTStrParam(err.what()));
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue