purgatory/clash-verge
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: instantiate core after init app, close #122

Browse Source
This commit is contained in:
GyDi 2022-07-06 15:14:33 +08:00 committed by GitHub
parent 711b220a05
commit 150f0cf486
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src-tauri/src/main.rs
View File

@ -38,7 +38,6 @@ fn main() -> std::io::Result<()> {
#[allow(unused_mut)] #[allow(unused_mut)]
let mut builder = tauri::Builder::default() let mut builder = tauri::Builder::default()
.manage(core::Core::new())
.setup(|app| Ok(resolve::resolve_setup(app))) .setup(|app| Ok(resolve::resolve_setup(app)))
.system_tray(SystemTray::new().with_menu(tray_menu)) .system_tray(SystemTray::new().with_menu(tray_menu))
.on_system_tray_event(move |app_handle, event| match event { .on_system_tray_event(move |app_handle, event| match event {

8
src-tauri/src/utils/resolve.rs
View File

@ -9,12 +9,16 @@ pub fn resolve_setup(app: &App) {
// init app config // init app config
init::init_app(app.package_info()); init::init_app(app.package_info());
// init states // init core
let core = app.state::<Core>(); // should be initialized after init_app fix #122
let core = Core::new();
core.set_win(app.get_window("main")); core.set_win(app.get_window("main"));
core.init(app.app_handle()); core.init(app.app_handle());
// fix #122
app.manage(core);
resolve_window(app); resolve_window(app);
} }