From a3db6475ca636db466a60cd66316f17912547f08 Mon Sep 17 00:00:00 2001 From: Misieq01 <38589417+Misieq01@users.noreply.github.com> Date: Fri, 28 Feb 2025 13:24:08 +0100 Subject: [PATCH 1/2] fix: autolauncher-edge-case (#1587) Fixes #1586 ## Summary by CodeRabbit - **Refactor** - Enhanced error handling and logging for the auto-launch feature, ensuring that issues during startup are recorded without interrupting operations. - Adjusted the initialization process to manage unused results, reducing unnecessary warnings and promoting a smoother, more robust experience. --- src-tauri/src/auto_launcher.rs | 8 ++++++-- src-tauri/src/main.rs | 5 +++-- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/src-tauri/src/auto_launcher.rs b/src-tauri/src/auto_launcher.rs index 221dccdb5..5684898a6 100644 --- a/src-tauri/src/auto_launcher.rs +++ b/src-tauri/src/auto_launcher.rs @@ -115,7 +115,9 @@ impl AutoLauncher { auto_launcher.enable()?; // To startup application as admin on windows, we need to create a task scheduler #[cfg(target_os = "windows")] - self.toggle_windows_admin_auto_launcher(true).await?; + let _unused = self.toggle_windows_admin_auto_launcher(true).await.inspect_err(|e| { + warn!(target: LOG_TARGET, "Failed to enable admin auto-launcher: {}", e) + }); } _ => { auto_launcher.enable()?; @@ -126,7 +128,9 @@ impl AutoLauncher { match PlatformUtils::detect_current_os() { CurrentOperatingSystem::Windows => { #[cfg(target_os = "windows")] - self.toggle_windows_admin_auto_launcher(false).await?; + let _unused = self.toggle_windows_admin_auto_launcher(false).await.inspect_err(|e| { + warn!(target: LOG_TARGET, "Failed to disable admin auto-launcher: {}", e) + }); auto_launcher.disable()?; } _ => { diff --git a/src-tauri/src/main.rs b/src-tauri/src/main.rs index 0c9b561e6..5ba294c1b 100644 --- a/src-tauri/src/main.rs +++ b/src-tauri/src/main.rs @@ -380,9 +380,10 @@ async fn setup_inner( let mm_proxy_manager = state.mm_proxy_manager.clone(); let is_auto_launcher_enabled = state.config.read().await.should_auto_launch(); - AutoLauncher::current() + let _unused = AutoLauncher::current() .initialize_auto_launcher(is_auto_launcher_enabled) - .await?; + .await + .inspect_err(|e| error!(target: LOG_TARGET, "Could not initialize auto launcher: {:?}", e)); let (tx, rx) = watch::channel("".to_string()); let progress = ProgressTracker::new(app.clone(), Some(tx)); From 91f5da7a03f7a2eb09071b59f7376350da921c15 Mon Sep 17 00:00:00 2001 From: brianp Date: Fri, 28 Feb 2025 13:28:59 +0100 Subject: [PATCH 2/2] chore: version bump v0.9.811 --- package-lock.json | 4 ++-- package.json | 2 +- src-tauri/Cargo.lock | 2 +- src-tauri/Cargo.toml | 2 +- src-tauri/tauri.conf.json | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package-lock.json b/package-lock.json index 5174b73b1..077d849c1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "tari-universe", - "version": "0.9.809", + "version": "0.9.811", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "tari-universe", - "version": "0.9.809", + "version": "0.9.811", "dependencies": { "@floating-ui/react": "^0.27.4", "@lottiefiles/dotlottie-react": "^0.13.0", diff --git a/package.json b/package.json index 09b33d815..dbb811418 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "tari-universe", "private": true, - "version": "0.9.810", + "version": "0.9.811", "type": "module", "scripts": { "dev": "vite dev --mode development", diff --git a/src-tauri/Cargo.lock b/src-tauri/Cargo.lock index adbe0d21c..94f27e966 100644 --- a/src-tauri/Cargo.lock +++ b/src-tauri/Cargo.lock @@ -7161,7 +7161,7 @@ dependencies = [ [[package]] name = "tari-universe" -version = "0.9.810" +version = "0.9.811" dependencies = [ "anyhow", "async-trait", diff --git a/src-tauri/Cargo.toml b/src-tauri/Cargo.toml index ff90c11df..76192e8ea 100644 --- a/src-tauri/Cargo.toml +++ b/src-tauri/Cargo.toml @@ -4,7 +4,7 @@ description = "Tari Universe" edition = "2021" name = "tari-universe" repository = "https://github.com/tari-project/universe" -version = "0.9.810" +version = "0.9.811" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.json index 5706436ec..f0b17ccc8 100644 --- a/src-tauri/tauri.conf.json +++ b/src-tauri/tauri.conf.json @@ -1,5 +1,5 @@ { - "version": "0.9.810", + "version": "0.9.811", "productName": "Tari Universe (Alpha)", "mainBinaryName": "Tari Universe (Alpha)", "identifier": "com.tari.universe.alpha",