From 2b6acedae1fa29646e10cee4483105fa3479a2d6 Mon Sep 17 00:00:00 2001
From: GyDi <zzzgydi@gmail.com>
Date: Thu, 16 Mar 2023 23:45:48 +0800
Subject: [PATCH] fix: appimage path unwrap panic
---
src-tauri/src/core/sysopt.rs | 19 ++++++++-----------
1 file changed, 8 insertions(+), 11 deletions(-)
diff --git a/src-tauri/src/core/sysopt.rs b/src-tauri/src/core/sysopt.rs
index 37c5033..6fee67b 100644
--- a/src-tauri/src/core/sysopt.rs
+++ b/src-tauri/src/core/sysopt.rs
@@ -178,18 +178,15 @@ impl Sysopt {
use tauri::Manager;
let handle = Handle::global();
- handle
- .app_handle
- .lock()
- .as_ref()
- .map(|app_handle| {
- app_handle
- .env()
- .appimage
+ match handle.app_handle.lock().as_ref() {
+ Some(app_handle) => {
+ let appimage = app_handle.env().appimage;
+ appimage
.and_then(|p| p.to_str().map(|s| s.to_string()))
- })
- .unwrap_or(Some(app_path))
- .unwrap()
+ .unwrap_or(app_path)
+ }
+ None => app_path,
+ }
};
let auto = AutoLaunchBuilder::new()
--
GitLab