From 06cb935ee34f143cd63cc401e85313e8658bb16b Mon Sep 17 00:00:00 2001 From: chrisnojima Date: Mon, 16 Oct 2023 12:08:30 -0400 Subject: [PATCH] stop listening to power events on linux (#25972) --- shared/desktop/app/node2.desktop.tsx | 34 ++++++++++++++++------------ 1 file changed, 19 insertions(+), 15 deletions(-) diff --git a/shared/desktop/app/node2.desktop.tsx b/shared/desktop/app/node2.desktop.tsx index 82b32cc9ecab..911ace1f155c 100644 --- a/shared/desktop/app/node2.desktop.tsx +++ b/shared/desktop/app/node2.desktop.tsx @@ -367,21 +367,25 @@ const plumbEvents = () => { Electron.nativeTheme.on('updated', () => { mainWindowDispatch(ConfigGen.createSetSystemDarkMode({dark: Electron.nativeTheme.shouldUseDarkColors})) }) - Electron.powerMonitor.on('suspend', () => { - mainWindowDispatch(ConfigGen.createPowerMonitorEvent({event: 'suspend'})) - }) - Electron.powerMonitor.on('resume', () => { - mainWindowDispatch(ConfigGen.createPowerMonitorEvent({event: 'resume'})) - }) - Electron.powerMonitor.on('shutdown', () => { - mainWindowDispatch(ConfigGen.createPowerMonitorEvent({event: 'shutdown'})) - }) - Electron.powerMonitor.on('lock-screen', () => { - mainWindowDispatch(ConfigGen.createPowerMonitorEvent({event: 'lock-screen'})) - }) - Electron.powerMonitor.on('unlock-screen', () => { - mainWindowDispatch(ConfigGen.createPowerMonitorEvent({event: 'unlock-screen'})) - }) + + // this crashes on newer electron, unclear why + if (!isLinux) { + Electron.powerMonitor.on('suspend', () => { + mainWindowDispatch(ConfigGen.createPowerMonitorEvent({event: 'suspend'})) + }) + Electron.powerMonitor.on('resume', () => { + mainWindowDispatch(ConfigGen.createPowerMonitorEvent({event: 'resume'})) + }) + Electron.powerMonitor.on('shutdown', () => { + mainWindowDispatch(ConfigGen.createPowerMonitorEvent({event: 'shutdown'})) + }) + Electron.powerMonitor.on('lock-screen', () => { + mainWindowDispatch(ConfigGen.createPowerMonitorEvent({event: 'lock-screen'})) + }) + Electron.powerMonitor.on('unlock-screen', () => { + mainWindowDispatch(ConfigGen.createPowerMonitorEvent({event: 'unlock-screen'})) + }) + } Electron.ipcMain.handle('KBdispatchAction', (_: any, action: any) => { mainWindow?.webContents.send('KBdispatchAction', action)