mirror of
https://gh.catmak.name/https://github.com/mihomo-party-org/mihomo-party
synced 2025-12-27 21:20:29 +08:00
fix alert blocking process
This commit is contained in:
parent
5b7958f2c7
commit
0ee6e144ed
@ -1,4 +1,4 @@
|
|||||||
import { app, ipcMain, safeStorage } from 'electron'
|
import { app, dialog, ipcMain, safeStorage } from 'electron'
|
||||||
import {
|
import {
|
||||||
mihomoChangeProxy,
|
mihomoChangeProxy,
|
||||||
mihomoCloseAllConnections,
|
mihomoCloseAllConnections,
|
||||||
@ -141,5 +141,8 @@ export function registerIpcMainHandlers(): void {
|
|||||||
ipcMain.handle('webdavBackup', ipcErrorWrapper(webdavBackup))
|
ipcMain.handle('webdavBackup', ipcErrorWrapper(webdavBackup))
|
||||||
ipcMain.handle('webdavRestore', (_e, filename) => ipcErrorWrapper(webdavRestore)(filename))
|
ipcMain.handle('webdavRestore', (_e, filename) => ipcErrorWrapper(webdavRestore)(filename))
|
||||||
ipcMain.handle('listWebdavBackups', ipcErrorWrapper(listWebdavBackups))
|
ipcMain.handle('listWebdavBackups', ipcErrorWrapper(listWebdavBackups))
|
||||||
|
ipcMain.handle('alert', (_e, msg) => {
|
||||||
|
dialog.showErrorBox('Mihomo Party', msg)
|
||||||
|
})
|
||||||
ipcMain.handle('quitApp', () => app.quit())
|
ipcMain.handle('quitApp', () => app.quit())
|
||||||
}
|
}
|
||||||
|
|||||||
@ -46,9 +46,13 @@ const EditFileModal: React.FC<Props> = (props) => {
|
|||||||
<Button
|
<Button
|
||||||
color="primary"
|
color="primary"
|
||||||
onPress={async () => {
|
onPress={async () => {
|
||||||
await setOverride(id, language === 'javascript' ? 'js' : 'yaml', currData)
|
try {
|
||||||
await restartCore()
|
await setOverride(id, language === 'javascript' ? 'js' : 'yaml', currData)
|
||||||
onClose()
|
await restartCore()
|
||||||
|
onClose()
|
||||||
|
} catch (e) {
|
||||||
|
alert(e)
|
||||||
|
}
|
||||||
}}
|
}}
|
||||||
>
|
>
|
||||||
确认
|
确认
|
||||||
|
|||||||
@ -27,9 +27,13 @@ const EditInfoModal: React.FC<Props> = (props) => {
|
|||||||
const [values, setValues] = useState(item)
|
const [values, setValues] = useState(item)
|
||||||
|
|
||||||
const onSave = async (): Promise<void> => {
|
const onSave = async (): Promise<void> => {
|
||||||
await updateProfileItem(values)
|
try {
|
||||||
await restartCore()
|
await updateProfileItem(values)
|
||||||
onClose()
|
await restartCore()
|
||||||
|
onClose()
|
||||||
|
} catch (e) {
|
||||||
|
alert(e)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return (
|
return (
|
||||||
|
|||||||
@ -268,3 +268,10 @@ export async function listWebdavBackups(): Promise<string[]> {
|
|||||||
export async function quitApp(): Promise<void> {
|
export async function quitApp(): Promise<void> {
|
||||||
return ipcErrorWrapper(await window.electron.ipcRenderer.invoke('quitApp'))
|
return ipcErrorWrapper(await window.electron.ipcRenderer.invoke('quitApp'))
|
||||||
}
|
}
|
||||||
|
|
||||||
|
async function alert<T>(msg: T): Promise<void> {
|
||||||
|
const msgStr = typeof msg === 'string' ? msg : JSON.stringify(msg)
|
||||||
|
return await window.electron.ipcRenderer.invoke('alert', msgStr)
|
||||||
|
}
|
||||||
|
|
||||||
|
window.alert = alert
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user