diff options
| author | GeckoEidechse <gecko.eidechse+git@pm.me> | 2024-08-02 02:43:39 +0200 |
|---|---|---|
| committer | GeckoEidechse <gecko.eidechse+git@pm.me> | 2024-08-02 02:43:39 +0200 |
| commit | 3362cd9b55021c1325fc573a90ee0be22497bdeb (patch) | |
| tree | 0aa139cd452fcb8d9f6bc9c6baac21e852b09f52 /src-tauri/src/main.rs | |
| parent | e5a74818e79e78d0e065d9375f38fd17a3a591a9 (diff) | |
| parent | edbce33c4a8f142967df868fb99476400f4ddfb3 (diff) | |
| download | FlightCore-3362cd9b55021c1325fc573a90ee0be22497bdeb.tar.gz FlightCore-3362cd9b55021c1325fc573a90ee0be22497bdeb.zip | |
Merge branch 'main' into chore/bump-upload-artifact-action
Diffstat (limited to 'src-tauri/src/main.rs')
| -rw-r--r-- | src-tauri/src/main.rs | 20 |
1 files changed, 7 insertions, 13 deletions
diff --git a/src-tauri/src/main.rs b/src-tauri/src/main.rs index 1fc55678..ee7da27f 100644 --- a/src-tauri/src/main.rs +++ b/src-tauri/src/main.rs @@ -3,11 +3,7 @@ windows_subsystem = "windows" )] -use std::{ - env, - sync::{Arc, Mutex}, - time::Duration, -}; +use std::{env, time::Duration}; mod constants; mod development; @@ -42,9 +38,6 @@ pub struct NorthstarThunderstoreReleaseWrapper { value: NorthstarThunderstoreRelease, } -#[derive(Default)] -struct Counter(Arc<Mutex<i32>>); - fn main() { // Setup logger let mut log_builder = pretty_env_logger::formatted_builder(); @@ -65,7 +58,7 @@ fn main() { }, )); - match tauri::Builder::default() + let tauri_builder_res = tauri::Builder::default() .plugin(tauri_plugin_store::Builder::default().build()) .setup(|app| { let app_handle = app.app_handle(); @@ -114,7 +107,7 @@ fn main() { Ok(()) }) - .manage(Counter(Default::default())) + .manage(()) .invoke_handler(tauri::generate_handler![ development::install_git_main, github::compare_tags, @@ -124,6 +117,7 @@ fn main() { github::pull_requests::get_launcher_download_link, github::pull_requests::get_pull_requests_wrapper, github::release_notes::check_is_flightcore_outdated, + github::release_notes::generate_release_note_announcement, github::release_notes::get_newest_flightcore_version, github::release_notes::get_northstar_release_notes, mod_management::delete_northstar_mod, @@ -145,7 +139,6 @@ fn main() { platform_specific::get_host_os, platform_specific::get_local_northstar_proton_wrapper_version, platform_specific::install_northstar_proton_wrapper, - platform_specific::linux_checks, platform_specific::uninstall_northstar_proton_wrapper, repair_and_verify::clean_up_download_folder_wrapper, repair_and_verify::disable_all_but_core, @@ -161,8 +154,9 @@ fn main() { util::kill_northstar, util::open_repair_window, ]) - .run(tauri::generate_context!()) - { + .run(tauri::generate_context!()); + + match tauri_builder_res { Ok(()) => (), Err(err) => { // Failed to launch system native web view |