From 557abd42850e638116fb19a641c2381e29a05eae Mon Sep 17 00:00:00 2001
From: GyDi <segydi@foxmail.com>
Date: Thu, 14 Apr 2022 01:29:02 +0800
Subject: [PATCH] fix: adjust code
---
src-tauri/src/main.rs | 4 +++-
src-tauri/src/utils/dirs.rs | 6 +++++-
2 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/src-tauri/src/main.rs b/src-tauri/src/main.rs
index 56e9fd9..dfa638a 100644
--- a/src-tauri/src/main.rs
+++ b/src-tauri/src/main.rs
@@ -10,7 +10,7 @@ mod utils;
use crate::{
core::VergeConfig,
- utils::{dirs, resolve, server},
+ utils::{resolve, server},
};
use tauri::{
api, CustomMenuItem, Manager, SystemTray, SystemTrayEvent, SystemTrayMenu, SystemTrayMenuItem,
@@ -24,6 +24,8 @@ fn main() -> std::io::Result<()> {
#[cfg(target_os = "windows")]
unsafe {
+ use crate::utils::dirs;
+
dirs::init_portable_flag();
}
diff --git a/src-tauri/src/utils/dirs.rs b/src-tauri/src/utils/dirs.rs
index a900fe3..9229c55 100644
--- a/src-tauri/src/utils/dirs.rs
+++ b/src-tauri/src/utils/dirs.rs
@@ -1,6 +1,5 @@
use std::env::temp_dir;
use std::path::PathBuf;
-use tauri::utils::platform::current_exe;
use tauri::{
api::path::{home_dir, resource_dir},
Env, PackageInfo,
@@ -21,9 +20,12 @@ static PROFILE_TEMP: &str = "clash-verge-runtime.yaml";
static mut PORTABLE_FLAG: bool = false;
/// initialize portable flag
+#[allow(unused)]
pub unsafe fn init_portable_flag() {
#[cfg(target_os = "windows")]
{
+ use tauri::utils::platform::current_exe;
+
let exe = current_exe().unwrap();
let dir = exe.parent().unwrap();
let dir = PathBuf::from(dir).join(".config/PORTABLE");
@@ -38,6 +40,8 @@ pub unsafe fn init_portable_flag() {
pub fn app_home_dir() -> PathBuf {
#[cfg(target_os = "windows")]
unsafe {
+ use tauri::utils::platform::current_exe;
+
if !PORTABLE_FLAG {
home_dir().unwrap().join(".config").join(APP_DIR)
} else {
--
GitLab