diff --git a/control/App.vue b/control/App.vue index 7761489b2..491aedb1f 100644 --- a/control/App.vue +++ b/control/App.vue @@ -64,7 +64,6 @@ import { i18n } from '$/locales/index.js' import localeModel from '$/plugins/element-plus/locale.js' const deviceStore = useDeviceStore() -const themeStore = useThemeStore() const locale = computed(() => { const i18nLocale = i18n.global.locale.value @@ -76,12 +75,10 @@ const locale = computed(() => { const deviceInfo = ref({}) -const deviceList = ref([]) - const deviceName = computed(() => deviceStore.getLabel(deviceInfo.value, ({ deviceName }) => deviceName)) function handleClose() { - window.electron.ipcRenderer.send('hide-active-window') + window.electron.ipcRenderer.invoke('hide-control-window') } async function switchDevice(e) { diff --git a/control/electron/main.js b/control/electron/main.js index e969840bc..682d2dd8a 100644 --- a/control/electron/main.js +++ b/control/electron/main.js @@ -29,4 +29,8 @@ export default (mainWindow) => { onControlMounted(controlWindow) }) }) + + ipcMain.handle('hide-control-window', () => { + controlWindow.hide() + }) } diff --git a/electron/ipc/app/index.js b/electron/ipc/app/index.js index ccbf1410b..68caace44 100644 --- a/electron/ipc/app/index.js +++ b/electron/ipc/app/index.js @@ -9,11 +9,17 @@ export default () => { ipcMain.on('close-active-window', (event) => { const win = BrowserWindow.getFocusedWindow() - win.close() + + if (win) { + win.close() + } }) ipcMain.on('hide-active-window', (event) => { const win = BrowserWindow.getFocusedWindow() - win.hide() + + if (win) { + win.hide() + } }) }