Merge branch 'master' into fortuna-linux

Jigsaw-Code · Apr 10, 2024 · 0236cd4 · 0236cd4
2 parents 7767855 + bac3931
commit 0236cd4
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/electron/electron-builder.json b/src/electron/electron-builder.json
@@ -1,5 +1,5 @@
 {
-  "files": ["build/electron", "www", "resources/tray", "!node_modules/electron"],
+  "files": ["build/electron", "www", "client/resources/tray", "!node_modules/electron"],
   "asarUnpack": ["output", "tools"],
   "artifactName": "Outline-Client.${ext}",
   "directories": {

diff --git a/src/electron/index.ts b/src/electron/index.ts
@@ -223,7 +223,7 @@ function updateTray(status: TunnelStatus) {
 }
 
 function createTrayIconImage(imageName: string) {
-  const image = nativeImage.createFromPath(path.join(app.getAppPath(), 'resources', 'tray', imageName));
+  const image = nativeImage.createFromPath(path.join(app.getAppPath(), 'client', 'resources', 'tray', imageName));
   if (image.isEmpty()) {
     throw new Error(`cannot find ${imageName} tray icon image`);
   }