From 1e7ff5b6d6d6f813d324f7b693089f6f02f43910 Mon Sep 17 00:00:00 2001 From: rafael-aero Date: Wed, 1 Sep 2021 20:57:41 +0200 Subject: [PATCH] fix getting id --- ElectronNET.Host/api/ipc.js | 10 +++++----- ElectronNET.Host/api/ipc.ts | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/ElectronNET.Host/api/ipc.js b/ElectronNET.Host/api/ipc.js index d4737a9..a6f8f13 100644 --- a/ElectronNET.Host/api/ipc.js +++ b/ElectronNET.Host/api/ipc.js @@ -6,14 +6,14 @@ module.exports = (socket) => { socket.on('registerIpcMainChannel', (channel) => { electron_1.ipcMain.on(channel, (event, args) => { event.preventDefault(); - electronSocket.emit(channel, [...args]); + electronSocket.emit(channel, [args]); }); }); socket.on('registerIpcMainChannelWithId', (channel) => { electron_1.ipcMain.on(channel, (event, args) => { event.preventDefault(); - let id = event.sender.senderId; - electronSocket.emit(channel, { id: id, args: [...args] }); + let id = event.sender.id; + electronSocket.emit(channel, { id: id, args: [args] }); }); }); socket.on('registerSyncIpcMainChannel', (channel) => { @@ -24,13 +24,13 @@ module.exports = (socket) => { event.returnValue = result; }); event.preventDefault(); - electronSocket.emit(channel, [...args]); + electronSocket.emit(channel, [args]); }); }); socket.on('registerOnceIpcMainChannel', (channel) => { electron_1.ipcMain.once(channel, (event, args) => { event.preventDefault(); - electronSocket.emit(channel, [...args]); + electronSocket.emit(channel, [args]); }); }); socket.on('removeAllListenersIpcMainChannel', (channel) => { diff --git a/ElectronNET.Host/api/ipc.ts b/ElectronNET.Host/api/ipc.ts index 52e90d5..3fe3b41 100644 --- a/ElectronNET.Host/api/ipc.ts +++ b/ElectronNET.Host/api/ipc.ts @@ -7,15 +7,15 @@ export = (socket: Socket) => { socket.on('registerIpcMainChannel', (channel) => { ipcMain.on(channel, (event, args) => { event.preventDefault(); - electronSocket.emit(channel, [...args]); + electronSocket.emit(channel, [args]); }); }); socket.on('registerIpcMainChannelWithId', (channel) => { ipcMain.on(channel, (event, args) => { event.preventDefault(); - let id = event.sender.senderId; - electronSocket.emit(channel, { id: id, args: [...args] }); + let id = event.sender.id; + electronSocket.emit(channel, { id: id, args: [args] }); }); }); @@ -27,14 +27,14 @@ export = (socket: Socket) => { event.returnValue = result; }); event.preventDefault(); - electronSocket.emit(channel, [...args]); + electronSocket.emit(channel, [args]); }); }); socket.on('registerOnceIpcMainChannel', (channel) => { ipcMain.once(channel, (event, args) => { event.preventDefault(); - electronSocket.emit(channel, [...args]); + electronSocket.emit(channel, [args]); }); });