dragonleo/NSIS
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

fixed bug #1174742 - Icon error message is uninformative

Browse source 
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@4508 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
kichik 2006-01-27 15:57:56 +00:00
parent a889217375
commit a94a7b67e3
3 changed files with 13 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

13
Source/script.cpp
View file

@ -1518,13 +1518,10 @@ int CEXEBuild::doCommand(int which_token, LineParser &line)
SCRIPT_MSG("Icon: \"%s\"\n",line.gettoken_str(1));
try {
init_res_editor();
if (replace_icon(res_editor, IDI_ICON2, line.gettoken_str(1)) < 0) {
ERROR_MSG("Error: File doesn't exist or is an invalid icon file\n");
return PS_ERROR;
}
replace_icon(res_editor, IDI_ICON2, line.gettoken_str(1));
}
catch (exception& err) {
ERROR_MSG("Error while replacing icon: %s\n", err.what());
ERROR_MSG("Error while setting icon to \"%s\": %s\n", line.gettoken_str(1), err.what());
return PS_ERROR;
}
return PS_OK;
@ -2929,13 +2926,9 @@ int CEXEBuild::doCommand(int which_token, LineParser &line)
try {
free(m_unicon_data);
m_unicon_data = generate_uninstall_icon_data(line.gettoken_str(1), m_unicon_size);
if (!m_unicon_data) {
ERROR_MSG("Error: File doesn't exist or is an invalid icon file\n");
return PS_ERROR;
}
}
catch (exception& err) {
ERROR_MSG("Error while replacing icon: %s\n", err.what());
ERROR_MSG("Error while setting icon to \"%s\": %s\n", line.gettoken_str(1), err.what());
return PS_ERROR;
}
return PS_OK;