diff --git a/src/common/cluster-ipc.ts b/src/common/cluster-ipc.ts index 8454c859e6..d44634407e 100644 --- a/src/common/cluster-ipc.ts +++ b/src/common/cluster-ipc.ts @@ -2,7 +2,7 @@ import { handleRequest } from "./ipc"; import { ClusterId, clusterStore } from "./cluster-store"; import { appEventBus } from "./event-bus"; import { ResourceApplier } from "../main/resource-applier"; -import { ipcMain } from "electron"; +import { ipcMain, IpcMainInvokeEvent } from "electron"; import { clusterFrameMap } from "./cluster-frames"; export const clusterActivateHandler = "cluster:activate"; @@ -21,11 +21,11 @@ if (ipcMain) { } }); - handleRequest(clusterSetFrameIdHandler, (event, clusterId: ClusterId, frameId: number, processId: number) => { + handleRequest(clusterSetFrameIdHandler, (event: IpcMainInvokeEvent, clusterId: ClusterId) => { const cluster = clusterStore.getById(clusterId); if (cluster) { - clusterFrameMap.set(cluster.id, { frameId, processId }); + clusterFrameMap.set(cluster.id, { frameId: event.frameId, processId: event.processId }); return cluster.pushState(); } diff --git a/src/renderer/components/app.tsx b/src/renderer/components/app.tsx index 99d20c3576..8fac0f652e 100755 --- a/src/renderer/components/app.tsx +++ b/src/renderer/components/app.tsx @@ -57,7 +57,7 @@ export class App extends React.Component { logger.info(`[APP]: Init dashboard, clusterId=${clusterId}, frameId=${frameId}`); await Terminal.preloadFonts(); - await requestMain(clusterSetFrameIdHandler, clusterId, frameId, process.pid); + await requestMain(clusterSetFrameIdHandler, clusterId); await getHostedCluster().whenReady; // cluster.activate() is done at this point extensionLoader.loadOnClusterRenderer(); setTimeout(() => {