| ... |
... |
@@ -781,6 +781,7 @@ nsBrowserContentHandler.prototype = { |
|
781
|
781
|
var overridePage = "";
|
|
782
|
782
|
var additionalPage = "";
|
|
783
|
783
|
var willRestoreSession = false;
|
|
|
784
|
+ let openAboutMullvadBrowser = false;
|
|
784
|
785
|
try {
|
|
785
|
786
|
// Read the old value of homepage_override.mstone before
|
|
786
|
787
|
// needHomepageOverride updates it, so that we can later add it to the
|
| ... |
... |
@@ -986,13 +987,8 @@ nsBrowserContentHandler.prototype = { |
|
986
|
987
|
"mullvadbrowser.post_update.shouldNotify",
|
|
987
|
988
|
true
|
|
988
|
989
|
);
|
|
989
|
|
- // If the user's homepage is about:mullvad-browser, we will inform
|
|
990
|
|
- // them about the update on that page; otherwise, we arrange to
|
|
991
|
|
- // open about:mullvad-browser in a secondary tab.
|
|
992
|
|
- overridePage =
|
|
993
|
|
- startPage === "about:mullvad-browser"
|
|
994
|
|
- ? ""
|
|
995
|
|
- : "about:mullvad-browser";
|
|
|
990
|
+ openAboutMullvadBrowser = true;
|
|
|
991
|
+ overridePage = "about:mullvad-browser";
|
|
996
|
992
|
}
|
|
997
|
993
|
break;
|
|
998
|
994
|
}
|
| ... |
... |
@@ -1093,6 +1089,16 @@ nsBrowserContentHandler.prototype = { |
|
1093
|
1089
|
startPage = "";
|
|
1094
|
1090
|
}
|
|
1095
|
1091
|
|
|
|
1092
|
+ // If the user's homepage is about:mullvad-browser, we do not want to open
|
|
|
1093
|
+ // it twice with the override.
|
|
|
1094
|
+ if (
|
|
|
1095
|
+ openAboutMullvadBrowser &&
|
|
|
1096
|
+ startPage === "about:mullvad-browser" &&
|
|
|
1097
|
+ overridePage?.split("|").includes("about:mullvad-browser")
|
|
|
1098
|
+ ) {
|
|
|
1099
|
+ startPage = "";
|
|
|
1100
|
+ }
|
|
|
1101
|
+
|
|
1096
|
1102
|
// Only show the startPage if we're not restoring an update session and are
|
|
1097
|
1103
|
// not set to skip the start page on this profile
|
|
1098
|
1104
|
if (overridePage && startPage && !willRestoreSession && !skipStartPage) {
|