fix(core): run setup after preparing system tray (#2312)

* fix(core): run setup after preparing system tray * change file [skip ci]
tauri-apps · Jul 28, 2021 · 1792c45 · 1792c45
1 parent 05e679a
commit 1792c45
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/.changes/setup-fix.md b/.changes/setup-fix.md
@@ -0,0 +1,5 @@
+---
+"tauri": patch
+---
+
+Run the setup callback after preparing the system tray.
diff --git a/core/tauri/src/app.rs b/core/tauri/src/app.rs
@@ -822,8 +822,6 @@ impl<R: Runtime> Builder<R> {
       }
     }
 
-    (self.setup)(&mut app).map_err(|e| crate::Error::Setup(e))?;
-
     #[cfg(feature = "system-tray")]
     if let Some(system_tray) = self.system_tray {
       let mut ids = HashMap::new();
@@ -894,6 +892,8 @@ impl<R: Runtime> Builder<R> {
       }
     }
 
+    (self.setup)(&mut app).map_err(|e| crate::Error::Setup(e))?;
+
     #[cfg(feature = "updater")]
     app.run_updater(main_window);