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

Abort if adding plug-in to installer fails (Bug #1264, part 2)

Browse source 
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@7267 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
anders_k 2021-05-11 19:14:08 +00:00
parent 53ff19bd81
commit 8f5ad1ac69
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Source/script.cpp
View file

@ -5123,7 +5123,7 @@ int CEXEBuild::doCommand(int which_token, LineParser &line)
// Add the DLL to the installer // Add the DLL to the installer
if (data_handle == -1) if (data_handle == -1)
{ {
int files_added; int files_added=0;
const int old_build_allowskipfiles=build_allowskipfiles; const int old_build_allowskipfiles=build_allowskipfiles;
build_allowskipfiles=1; // on build_allowskipfiles=1; // on
const int old_build_overwrite=build_overwrite; const int old_build_overwrite=build_overwrite;
@ -5136,8 +5136,8 @@ int CEXEBuild::doCommand(int which_token, LineParser &line)
// because of CEXEBuild::datablock_optimize() that tries to discover // because of CEXEBuild::datablock_optimize() that tries to discover
// duplicates and reuse them. // duplicates and reuse them.
ret=do_add_file(dllPath.c_str(),0,0,&files_added,tempDLL,2,&data_handle); // 2 means no size add ret=do_add_file(dllPath.c_str(),0,0,&files_added,tempDLL,2,&data_handle); // 2 means no size add
if (ret != PS_OK) { if (ret != PS_OK || files_added == 0) {
return ret; return files_added ? ret : PS_ERROR;
} }
m_pPlugins->SetDllDataHandle(!!uninstall_mode, command, data_handle); m_pPlugins->SetDllDataHandle(!!uninstall_mode, command, data_handle);
build_overwrite=old_build_overwrite; build_overwrite=old_build_overwrite;