From cf91be29277cd9163bc866539c0d2bdca29ab6f8 Mon Sep 17 00:00:00 2001 From: kichik Date: Sun, 14 Jul 2013 19:38:06 +0000 Subject: [PATCH] fix bug #1076 - always be silent if the user passes /S on the command line, even the installer file can't be read. the installer is not always executed from the computer itself and remote deployment can stall because of this issue (with psexec -c on x64 for example). git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6385 212acab6-be3b-0410-9dea-997c60f758d6 --- Source/exehead/Main.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Source/exehead/Main.c b/Source/exehead/Main.c index 31fc96f2..743a327a 100644 --- a/Source/exehead/Main.c +++ b/Source/exehead/Main.c @@ -150,7 +150,9 @@ EXTERN_C void NSISWinMainNOCRT() #if defined(NSIS_CONFIG_VISIBLE_SUPPORT) && defined(NSIS_CONFIG_SILENT_SUPPORT) if (cmdline[0] == _T('S') && END_OF_ARG(cmdline[1])) - cl_flags |= FH_FLAGS_SILENT; + g_exec_flags.silent = 1; // bug #1076 - just set the silent flag. the user really wants it silent. + // loadHeaders() will not reset this as it uses |= to apply the script flags. + // there is also no option to force non-silent like `CRCCheck force` #endif//NSIS_CONFIG_SILENT_SUPPORT && NSIS_CONFIG_VISIBLE_SUPPORT #ifdef NSIS_CONFIG_CRC_SUPPORT if (CMP4CHAR(cmdline, _T("NCRC")) && END_OF_ARG(cmdline[4]))