Bug fixes

This commit is contained in:
Vichingo455 2025-05-29 08:34:24 +02:00
parent 8ad6844368
commit 68b1f6f9f4
2 changed files with 3 additions and 11 deletions

View File

@ -18,9 +18,8 @@
System::Call '${GetUserName}(.r0, ${NSIS_MAX_STRLEN}) .r1' System::Call '${GetUserName}(.r0, ${NSIS_MAX_STRLEN}) .r1'
${If} ${IsRunOnce} ${If} ${IsRunOnce}
${AndIf} $0 == "SYSTEM" ${AndIf} $0 == "SYSTEM"
; Running in setup mode. Winlogon will reboot for us. ; Running in setup mode. Reboot is mandatory.
SetErrorLevel ${ERROR_SUCCESS} Reboot
Quit
${Else} ${Else}
; Regular reboot. ; Regular reboot.
Reboot Reboot
@ -143,13 +142,6 @@ Function RebootIfRequired
${Else} ${Else}
; Restore setup keys ; Restore setup keys
Call CleanUpRunOnce Call CleanUpRunOnce
; Give the user a moment to understand we're rebooting
${DetailPrint} "$(StatusRestarting)"
Sleep 2000
; Now reboot
Reboot
; To be sure
Sleep 10000
${EndIf} ${EndIf}
FunctionEnd FunctionEnd

View File

@ -304,7 +304,7 @@ ${MementoSection} "$(SectionRootCerts)" ROOTCERTS
${EndIf} ${EndIf}
${MementoSectionEnd} ${MementoSectionEnd}
${MementoSection} "$(SectionEnableMU)" WIN7MU ${MementoUnselectedSection} "$(SectionEnableMU)" WIN7MU
LegacyUpdateNSIS::EnableMicrosoftUpdate LegacyUpdateNSIS::EnableMicrosoftUpdate
Pop $0 Pop $0
${If} $0 != 0 ${If} $0 != 0