Skip to content

Commit

Permalink
fix(core): initialize system tray before app windows
Browse files Browse the repository at this point in the history
  • Loading branch information
lucasfernog committed Aug 31, 2021
1 parent 4042769 commit dbe0d21
Show file tree
Hide file tree
Showing 2 changed files with 28 additions and 23 deletions.
5 changes: 5 additions & 0 deletions .changes/fix-tray-command.md
@@ -0,0 +1,5 @@
---
"tauri": patch
---

Initialize system tray before windows so `tray_handle` can be accessed on command handlers.
46 changes: 23 additions & 23 deletions core/tauri/src/app.rs
Expand Up @@ -914,29 +914,6 @@ impl<R: Runtime> Builder<R> {
},
};

app.manager.initialize_plugins(&app.handle())?;

let pending_labels = self
.pending_windows
.iter()
.map(|p| p.label.clone())
.collect::<Vec<_>>();

#[cfg(feature = "updater")]
let mut main_window = None;

for pending in self.pending_windows {
let pending = app
.manager
.prepare_window(app.handle.clone(), pending, &pending_labels)?;
let detached = app.runtime.as_ref().unwrap().create_window(pending)?;
let _window = app.manager.attach_window(app.handle(), detached);
#[cfg(feature = "updater")]
if main_window.is_none() {
main_window = Some(_window);
}
}

#[cfg(feature = "system-tray")]
if let Some(system_tray) = self.system_tray {
let mut ids = HashMap::new();
Expand Down Expand Up @@ -1027,6 +1004,29 @@ impl<R: Runtime> Builder<R> {
}
}

app.manager.initialize_plugins(&app.handle())?;

let pending_labels = self
.pending_windows
.iter()
.map(|p| p.label.clone())
.collect::<Vec<_>>();

#[cfg(feature = "updater")]
let mut main_window = None;

for pending in self.pending_windows {
let pending = app
.manager
.prepare_window(app.handle.clone(), pending, &pending_labels)?;
let detached = app.runtime.as_ref().unwrap().create_window(pending)?;
let _window = app.manager.attach_window(app.handle(), detached);
#[cfg(feature = "updater")]
if main_window.is_none() {
main_window = Some(_window);
}
}

(self.setup)(&mut app).map_err(|e| crate::Error::Setup(e))?;

#[cfg(feature = "updater")]
Expand Down

0 comments on commit dbe0d21

Please sign in to comment.