summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorOskar Nyberg <oskar@mullvad.net>2021-06-17 10:51:55 +0200
committerOskar Nyberg <oskar@mullvad.net>2021-06-17 10:51:55 +0200
commit2749175102717c74ff945c49302cef8a1ac00bad (patch)
tree32e567758a991047640a176833eaa4044f967a13
parent6b7d8e65da4832c11313a02fbc500ff4bbe1a57c (diff)
parent0b62009c7961a415bf59133633f25fff56ec98f7 (diff)
downloadmullvadvpn-2749175102717c74ff945c49302cef8a1ac00bad.tar.xz
mullvadvpn-2749175102717c74ff945c49302cef8a1ac00bad.zip
Merge branch 'fix-beta-link'
-rw-r--r--CHANGELOG.md2
-rw-r--r--gui/src/main/index.ts10
2 files changed, 7 insertions, 5 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index b3137c4d30..d071331587 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -25,6 +25,8 @@ Line wrap the file at 100 chars. Th
## [Unreleased]
### Fixed
+- Fix link to download page not always using the beta URL when it should.
+
#### Linux
- Make offline monitor aware of routing table changes.
- Assign local DNS servers to more appropriate interfaces when using systemd-resolved.
diff --git a/gui/src/main/index.ts b/gui/src/main/index.ts
index 4e9aacc85c..2b9bc74a0a 100644
--- a/gui/src/main/index.ts
+++ b/gui/src/main/index.ts
@@ -892,11 +892,14 @@ class ApplicationMain {
const suggestedIsBeta =
latestVersionInfo.suggestedUpgrade !== undefined &&
IS_BETA.test(latestVersionInfo.suggestedUpgrade);
- this.upgradeVersion = {
+
+ const upgradeVersion = {
...latestVersionInfo,
suggestedIsBeta,
};
+ this.upgradeVersion = upgradeVersion;
+
// notify user to update the app if it became unsupported
const notificationProviders = [
new UnsupportedVersionNotificationProvider({
@@ -918,10 +921,7 @@ class ApplicationMain {
}
if (this.windowController) {
- IpcMainEventChannel.upgradeVersion.notify(
- this.windowController.webContents,
- latestVersionInfo,
- );
+ IpcMainEventChannel.upgradeVersion.notify(this.windowController.webContents, upgradeVersion);
}
}