fix: tray icon and tray rate display expression logic bug

This commit is contained in:
Tunglies
2025-03-26 19:07:09 +08:00
parent 42db9ea0bb
commit 6e40dd9862
6 changed files with 9 additions and 10 deletions

View File

@@ -387,13 +387,13 @@ impl CoreManager {
Ok(_) => {
Config::runtime().apply();
logging!(info, Type::Core, true, "Configuration updated successfully");
return Ok(());
Ok(())
}
Err(e) => {
let msg = e.to_string();
Config::runtime().discard();
logging_error!(Type::Core, true, "Failed to update configuration: {}", msg);
return Err(msg);
Err(msg)
}
}
}
@@ -419,7 +419,7 @@ impl CoreManager {
"-d",
dirs::path_to_str(&config_dir)?,
"-f",
dirs::path_to_str(&config_file)?,
dirs::path_to_str(config_file)?,
])
.spawn()?;
let pid = child.pid();

View File

@@ -256,7 +256,7 @@ impl Tray {
*icon_bytes_guard = Some(icon_bytes.clone());
}
if !enable_tray_speed || (!enable_tray_speed && !enable_tray_icon) {
if !enable_tray_speed {
let _ = tray.set_icon(Some(tauri::image::Image::from_bytes(
&(*icon_bytes_guard).clone().unwrap(),
)?));