Bug 1872543 - Fixed tab freeze due to getLaunchOnLoginShortcuts r=nal…

…exander,mhughes Differential Revision: https://phabricator.services.mozilla.com/D197590
dothq · Jan 3, 2024 · e0bee69 · e0bee69
1 parent b3387dc
commit e0bee69
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 8 deletions.
diff --git a/browser/components/newtab/lib/OnboardingMessageProvider.jsm b/browser/components/newtab/lib/OnboardingMessageProvider.jsm
@@ -990,9 +990,10 @@ const BASE_MESSAGES = () => [
       lifetime: 1,
     },
     trigger: { id: "defaultBrowserCheck" },
-    targeting: `source == 'newtab' && !launchOnLoginEnabled
+    targeting: `source == 'newtab'
     && 'browser.startup.windowsLaunchOnLogin.disableLaunchOnLoginPrompt'|preferenceValue == false
-    && 'browser.startup.windowsLaunchOnLogin.enabled'|preferenceValue == true && isDefaultBrowser && !activeNotifications`,
+    && 'browser.startup.windowsLaunchOnLogin.enabled'|preferenceValue == true && isDefaultBrowser && !activeNotifications
+    && !launchOnLoginEnabled`,
   },
   {
     id: "INFOBAR_LAUNCH_ON_LOGIN_FINAL",
@@ -1054,12 +1055,13 @@ const BASE_MESSAGES = () => [
       lifetime: 1,
     },
     trigger: { id: "defaultBrowserCheck" },
-    targeting: `source == 'newtab' && !launchOnLoginEnabled
+    targeting: `source == 'newtab'
     && 'browser.startup.windowsLaunchOnLogin.disableLaunchOnLoginPrompt'|preferenceValue == false
     && 'browser.startup.windowsLaunchOnLogin.enabled'|preferenceValue == true && isDefaultBrowser && !activeNotifications
     && messageImpressions.INFOBAR_LAUNCH_ON_LOGIN[messageImpressions.INFOBAR_LAUNCH_ON_LOGIN | length - 1]
     && messageImpressions.INFOBAR_LAUNCH_ON_LOGIN[messageImpressions.INFOBAR_LAUNCH_ON_LOGIN | length - 1] <
-      currentDate|date - ${FOURTEEN_DAYS_IN_MS}`,
+      currentDate|date - ${FOURTEEN_DAYS_IN_MS}
+    && !launchOnLoginEnabled`,
   },
   {
     id: "FOX_DOODLE_SET_DEFAULT",

diff --git a/browser/components/shell/nsWindowsShellService.cpp b/browser/components/shell/nsWindowsShellService.cpp
@@ -987,10 +987,6 @@ nsWindowsShellService::GetLaunchOnLoginShortcuts(
     if (NS_WARN_IF(FAILED(hr))) {
       continue;
     }
-    hr = link->Resolve(nullptr, SLR_NO_UI);
-    if (NS_WARN_IF(FAILED(hr))) {
-      continue;
-    }
     hr = link->GetPath(target.get(), MAX_PATH, nullptr, 0);
     if (NS_WARN_IF(FAILED(hr))) {
       continue;