stop listening to power events on linux (#25972)

keybase · Oct 16, 2023 · 06cb935 · 06cb935
1 parent a154ede
commit 06cb935
Showing 1 changed file with 19 additions and 15 deletions.
diff --git 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)