diff --git a/src-tauri/src/main.rs b/src-tauri/src/main.rs index 9d729e4..10ae550 100644 --- a/src-tauri/src/main.rs +++ b/src-tauri/src/main.rs @@ -38,7 +38,6 @@ fn main() -> std::io::Result<()> { #[allow(unused_mut)] let mut builder = tauri::Builder::default() - .manage(core::Core::new()) .setup(|app| Ok(resolve::resolve_setup(app))) .system_tray(SystemTray::new().with_menu(tray_menu)) .on_system_tray_event(move |app_handle, event| match event { diff --git a/src-tauri/src/utils/resolve.rs b/src-tauri/src/utils/resolve.rs index 70025ea..b35a043 100644 --- a/src-tauri/src/utils/resolve.rs +++ b/src-tauri/src/utils/resolve.rs @@ -9,12 +9,16 @@ pub fn resolve_setup(app: &App) { // init app config init::init_app(app.package_info()); - // init states - let core = app.state::(); + // init core + // should be initialized after init_app fix #122 + let core = Core::new(); core.set_win(app.get_window("main")); core.init(app.app_handle()); + // fix #122 + app.manage(core); + resolve_window(app); }