Skip to content

Commit e0bee69

Browse files
committed
Bug 1872543 - Fixed tab freeze due to getLaunchOnLoginShortcuts r=nalexander,mhughes
Differential Revision: https://phabricator.services.mozilla.com/D197590
1 parent b3387dc commit e0bee69

File tree

2 files changed

+6
-8
lines changed

2 files changed

+6
-8
lines changed

browser/components/newtab/lib/OnboardingMessageProvider.jsm

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -990,9 +990,10 @@ const BASE_MESSAGES = () => [
990990
lifetime: 1,
991991
},
992992
trigger: { id: "defaultBrowserCheck" },
993-
targeting: `source == 'newtab' && !launchOnLoginEnabled
993+
targeting: `source == 'newtab'
994994
&& 'browser.startup.windowsLaunchOnLogin.disableLaunchOnLoginPrompt'|preferenceValue == false
995-
&& 'browser.startup.windowsLaunchOnLogin.enabled'|preferenceValue == true && isDefaultBrowser && !activeNotifications`,
995+
&& 'browser.startup.windowsLaunchOnLogin.enabled'|preferenceValue == true && isDefaultBrowser && !activeNotifications
996+
&& !launchOnLoginEnabled`,
996997
},
997998
{
998999
id: "INFOBAR_LAUNCH_ON_LOGIN_FINAL",
@@ -1054,12 +1055,13 @@ const BASE_MESSAGES = () => [
10541055
lifetime: 1,
10551056
},
10561057
trigger: { id: "defaultBrowserCheck" },
1057-
targeting: `source == 'newtab' && !launchOnLoginEnabled
1058+
targeting: `source == 'newtab'
10581059
&& 'browser.startup.windowsLaunchOnLogin.disableLaunchOnLoginPrompt'|preferenceValue == false
10591060
&& 'browser.startup.windowsLaunchOnLogin.enabled'|preferenceValue == true && isDefaultBrowser && !activeNotifications
10601061
&& messageImpressions.INFOBAR_LAUNCH_ON_LOGIN[messageImpressions.INFOBAR_LAUNCH_ON_LOGIN | length - 1]
10611062
&& messageImpressions.INFOBAR_LAUNCH_ON_LOGIN[messageImpressions.INFOBAR_LAUNCH_ON_LOGIN | length - 1] <
1062-
currentDate|date - ${FOURTEEN_DAYS_IN_MS}`,
1063+
currentDate|date - ${FOURTEEN_DAYS_IN_MS}
1064+
&& !launchOnLoginEnabled`,
10631065
},
10641066
{
10651067
id: "FOX_DOODLE_SET_DEFAULT",

browser/components/shell/nsWindowsShellService.cpp

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -987,10 +987,6 @@ nsWindowsShellService::GetLaunchOnLoginShortcuts(
987987
if (NS_WARN_IF(FAILED(hr))) {
988988
continue;
989989
}
990-
hr = link->Resolve(nullptr, SLR_NO_UI);
991-
if (NS_WARN_IF(FAILED(hr))) {
992-
continue;
993-
}
994990
hr = link->GetPath(target.get(), MAX_PATH, nullptr, 0);
995991
if (NS_WARN_IF(FAILED(hr))) {
996992
continue;

0 commit comments

Comments
 (0)