From deb3a053d8303b69333220d13f4757ea35e3c646 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Wed, 26 Jun 2024 08:16:28 +0200 Subject: Merging upstream version 127.0.2. Signed-off-by: Daniel Baumann --- browser/installer/windows/nsis/shared.nsh | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'browser/installer') diff --git a/browser/installer/windows/nsis/shared.nsh b/browser/installer/windows/nsis/shared.nsh index f9f50a5afa..f9cd1feac1 100755 --- a/browser/installer/windows/nsis/shared.nsh +++ b/browser/installer/windows/nsis/shared.nsh @@ -175,6 +175,9 @@ ; updated, but only if we're not the instance of PostUpdate that was started ; by the service, because this needs to run as the actual user. Also, don't do ; that if the installer was told not to register the agent task at all. +; XXXbytesized - This also needs to un-register any scheduled tasks for the WDBA +; that were registered using elevation, but currently it does +; not. See Bugs 1638509 and 1902719. !ifdef MOZ_DEFAULT_BROWSER_AGENT ${If} $TmpVal == "HKCU" ClearErrors @@ -184,10 +187,6 @@ ${If} $TmpVal == "HKCU" ${OrIf} ${Errors} ExecWait '"$INSTDIR\default-browser-agent.exe" register-task $AppUserModelID' ${EndIf} -${ElseIf} $TmpVal == "HKLM" - ; If we're the privileged PostUpdate, make sure that the unprivileged one - ; will have permission to create a task by clearing out the old one first. - ExecWait '"$INSTDIR\default-browser-agent.exe" unregister-task $AppUserModelID' ${EndIf} !endif -- cgit v1.2.3