shkong/clash-verge-rev
1
0
Fork 0
mirror of https://github.com/clash-verge-rev/clash-verge-rev synced 2025-05-05 04:53:44 +08:00
Code Packages Projects Releases Activity

fix: Stop core before install update

Browse Source
This commit is contained in:
MystiPanda 2023-12-05 15:01:15 +08:00
parent 0a5ec11b1b
commit feac8085c9
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src-tauri/src/main.rs
View File

@ -105,6 +105,10 @@ fn main() -> std::io::Result<()> {
api::process::kill_children(); api::process::kill_children();
app_handle.exit(0); app_handle.exit(0);
} }
tauri::RunEvent::Updater(tauri::UpdaterEvent::Downloaded) => {
resolve::resolve_reset();
api::process::kill_children();
}
#[cfg(target_os = "macos")] #[cfg(target_os = "macos")]
tauri::RunEvent::WindowEvent { label, event, .. } => { tauri::RunEvent::WindowEvent { label, event, .. } => {
use tauri::Manager; use tauri::Manager;

7
src/components/setting/mods/update-viewer.tsx
View File

@ -75,14 +75,17 @@ export const UpdateViewer = forwardRef<DialogRef>((props, ref) => {
<BaseDialog <BaseDialog
open={open} open={open}
title={`New Version v${updateInfo?.manifest?.version}`} title={`New Version v${updateInfo?.manifest?.version}`}
contentSx={{ minWidth: 360, maxWidth: 400, maxHeight: "50vh" }} contentSx={{ minWidth: 360, maxWidth: 400, height: "50vh" }}
okBtn={t("Update")} okBtn={t("Update")}
cancelBtn={t("Cancel")} cancelBtn={t("Cancel")}
onClose={() => setOpen(false)} onClose={() => setOpen(false)}
onCancel={() => setOpen(false)} onCancel={() => setOpen(false)}
onOk={onUpdate} onOk={onUpdate}
> >
<UpdateLog dangerouslySetInnerHTML={{ __html: parseContent }} /> <UpdateLog
dangerouslySetInnerHTML={{ __html: parseContent }}
sx={{ height: "calc(100% - 10px)", overflow: "auto" }}
/>
{updateState && ( {updateState && (
<LinearProgress <LinearProgress
variant="buffer" variant="buffer"