fix(codegen): tray icon path is relative to the config directory

tauri-apps · Jun 15, 2022 · 562e8ca · 562e8ca
1 parent dc432ef
commit 562e8ca
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/.changes/fix-tray-icon-lookup.md b/.changes/fix-tray-icon-lookup.md
@@ -0,0 +1,5 @@
+---
+"tauri-codegen": patch
+---
+
+Read the tray icon path relatively to the config directory.
diff --git a/core/tauri-codegen/src/context.rs b/core/tauri-codegen/src/context.rs
@@ -242,7 +242,7 @@ pub fn context_codegen(data: ContextData) -> Result<TokenStream, EmbeddedAssetsE
   );
 
   let system_tray_icon = if let Some(tray) = &config.tauri.system_tray {
-    let system_tray_icon_path = tray.icon_path.clone();
+    let system_tray_icon_path = config_parent.join(&tray.icon_path);
     let ext = system_tray_icon_path.extension();
     if ext.map_or(false, |e| e == "ico") {
       ico_icon(&root, &out_dir, system_tray_icon_path)?