summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorOskar Nyberg <oskar@mullvad.net>2021-04-06 16:05:38 +0200
committerOskar Nyberg <oskar@mullvad.net>2021-04-06 16:05:38 +0200
commit0e7270bc43aeb3e235846fb024bea73c1209bf15 (patch)
tree8a026fb4bfb01bd0d4950e7d1b93e4a3ee23bd42
parentdde4dbcd7326f264b539f53b28a4d1187d112bce (diff)
parent15553a78d4c61e08eca7bf51ee04ea456b0cd539 (diff)
downloadmullvadvpn-0e7270bc43aeb3e235846fb024bea73c1209bf15.tar.xz
mullvadvpn-0e7270bc43aeb3e235846fb024bea73c1209bf15.zip
Merge branch 'prevent-icons-in-temp'
-rw-r--r--CHANGELOG.md1
-rw-r--r--gui/tasks/distribution.js5
2 files changed, 5 insertions, 1 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index edaa39109c..27f012050b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -73,6 +73,7 @@ Line wrap the file at 100 chars. Th
#### Windows
- Fix "cannot find the file" error while creating a Wintun adapter by upgrading Wintun.
- Retry when creating a WireGuard tunnel fails due to no default routes being found.
+- Prevent tray icons from being extraced to `%TEMP%` directory.
#### Linux
- Stop using NM for managing DNS if it's newer than 1.26.
diff --git a/gui/tasks/distribution.js b/gui/tasks/distribution.js
index d6e6481871..e70ba6ab37 100644
--- a/gui/tasks/distribution.js
+++ b/gui/tasks/distribution.js
@@ -180,7 +180,10 @@ const config = {
function packWin() {
return builder.build({
targets: builder.Platform.WINDOWS.createTarget(),
- config: config,
+ config: {
+ ...config,
+ asarUnpack: ['build/assets/images/menubar icons/win32/lock-*.ico'],
+ },
});
}