From 1bce897744fd36b4c16fadcaf4ccba0ffcb7f869 Mon Sep 17 00:00:00 2001 From: MathieuG-P <40181755+Zagrios@users.noreply.github.com> Date: Thu, 30 Jun 2022 20:44:18 +0200 Subject: [PATCH] fix open release page opened two time --- src/main/ipcs/os-controls-ipcs.ts | 10 +++++----- src/main/main.ts | 6 +----- .../available-version-item.component.tsx | 4 +++- 3 files changed, 9 insertions(+), 11 deletions(-) diff --git a/src/main/ipcs/os-controls-ipcs.ts b/src/main/ipcs/os-controls-ipcs.ts index 3edce3a5..f298a3e8 100644 --- a/src/main/ipcs/os-controls-ipcs.ts +++ b/src/main/ipcs/os-controls-ipcs.ts @@ -20,16 +20,16 @@ ipcMain.on('window.reset', async () => { getMainWindow()?.restore(); }); -ipcMain.on('new-window', async (event, url: string) => { - shell.openExternal(url); +ipcMain.on('new-window', async (event, request: IpcRequest) => { + shell.openExternal(request.args); }); ipcMain.on('choose-folder', async (event, request: IpcRequest) => { dialog.showOpenDialog({properties: ['openDirectory']}).then(res => { UtilsService.getInstance().newIpcSenc(request.responceChannel, {success: true, data: res}); - }) -}) + }); +}); ipcMain.on("window.progression", async (event, request: IpcRequest) => { getMainWindow().setProgressBar(request.args / 100); -}) +}); diff --git a/src/main/main.ts b/src/main/main.ts index 06ed4602..84954e65 100644 --- a/src/main/main.ts +++ b/src/main/main.ts @@ -143,8 +143,4 @@ app if (mainWindow === null) createWindow(); }); }) - .catch(console.log); - - ipcMain.on('new-window', (event, url: string) => { - shell.openExternal(url); - }); \ No newline at end of file + .catch(console.log); \ No newline at end of file diff --git a/src/renderer/components/available-versions/available-version-item.component.tsx b/src/renderer/components/available-versions/available-version-item.component.tsx index c9bf0500..99e94e1a 100644 --- a/src/renderer/components/available-versions/available-version-item.component.tsx +++ b/src/renderer/components/available-versions/available-version-item.component.tsx @@ -7,10 +7,12 @@ import { distinctUntilChanged } from "rxjs"; import defaultImage from '../../../../assets/default-version-img.jpg' import dateFormat from "dateformat"; import { BsmImage } from "../shared/bsm-image.component"; +import { IpcService } from "renderer/services/ipc.service"; export function AvailableVersionItem(props: {version: BSVersion}) { const bsDownloaderService = BsDownloaderService.getInstance(); + const ipcService = IpcService.getInstance(); const [selected, setSelected] = useState(false); @@ -22,7 +24,7 @@ export function AvailableVersionItem(props: {version: BSVersion}) { else{ bsDownloaderService.selectedBsVersion$.next(props.version); } } - const openReleasePage = () => { console.log(props.version.ReleaseURL); window.electron.ipcRenderer.sendMessage("new-window", props.version.ReleaseURL); } + const openReleasePage = () => { ipcService.sendLazy("new-window", {args: props.version.ReleaseURL}); } useEffect(() => { const sub = bsDownloaderService.selectedBsVersion$.pipe(distinctUntilChanged()).subscribe((version) => {