Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: use powerMonitor.on() only after app is ready #21927

Merged
Merged
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
38 changes: 27 additions & 11 deletions lib/browser/api/power-monitor.ts
Expand Up @@ -10,19 +10,35 @@ Object.setPrototypeOf(PowerMonitor.prototype, EventEmitter.prototype)

const powerMonitor = createLazyInstance(createPowerMonitor, PowerMonitor, true)

// On Linux we need to call blockShutdown() to subscribe to shutdown event.
if (process.platform === 'linux') {
powerMonitor.on('newListener', (event:string) => {
if (event === 'shutdown' && powerMonitor.listenerCount('shutdown') === 0) {
powerMonitor.blockShutdown()
}
})
/* In order to delay system shutdown when e.preventDefault() is invoked
ckerr marked this conversation as resolved.
Show resolved Hide resolved
* on a powerMonitor 'shutdown' event, we need an org.freedesktop.login1
* delay lock. For more details see the "Taking Delay Locks" section of
* https://www.freedesktop.org/wiki/Software/systemd/inhibit/
*
* So here we watch for 'shutdown' listeners to be added or removed and
* set or unset our shutdown delay lock accordingly. */
const onceReady = (): void => {
powerMonitor.on('newListener', (event: string) => {
// whenever the listener count is incremented to one...
if (event === 'shutdown' && powerMonitor.listenerCount('shutdown') === 0) {
powerMonitor.blockShutdown()
}
})
powerMonitor.on('removeListener', (event: string) => {
// whenever the listener count is decremented to zero...
if (event === 'shutdown' && powerMonitor.listenerCount('shutdown') === 0) {
powerMonitor.unblockShutdown()
}
})
}

powerMonitor.on('removeListener', (event: string) => {
if (event === 'shutdown' && powerMonitor.listenerCount('shutdown') === 0) {
powerMonitor.unblockShutdown()
}
})
const { app } = require('electron')
if (app.isReady()) {
ckerr marked this conversation as resolved.
Show resolved Hide resolved
onceReady()
} else {
app.once('ready', onceReady)
ckerr marked this conversation as resolved.
Show resolved Hide resolved
}
}

module.exports = powerMonitor