github/electron
1
1
Fork 0
mirror of https://github.com/electron/electron.git synced 2026-01-28 08:48:14 -05:00
Code Issues Packages Projects Releases Wiki Activity

fixup! Implement powerMonitor 'shutdown' event for Linux

Browse Source
This commit is contained in:
Thiago de Arruda
2017-12-14 08:39:00 -03:00
committed by Cheng Zhao
parent df6328e5d7
commit 45763c0afb
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
atom/browser/lib/power_observer_linux.cc
View File

@@ -122,12 +122,12 @@ void PowerObserverLinux::OnInhibitResponse(base::ScopedFD* scoped_fd,
void PowerObserverLinux::OnPrepareForSleep(dbus::Signal* signal) {
dbus::MessageReader reader(signal);
bool status;
if (!reader.PopBool(&status)) {
bool suspending;
if (!reader.PopBool(&suspending)) {
LOG(ERROR) << "Invalid signal: " << signal->ToString();
return;
}
if (status) {
if (suspending) {
OnSuspend();
sleep_lock_.reset();
} else {
@@ -138,12 +138,12 @@ void PowerObserverLinux::OnPrepareForSleep(dbus::Signal* signal) {
void PowerObserverLinux::OnPrepareForShutdown(dbus::Signal* signal) {
dbus::MessageReader reader(signal);
bool status;
if (!reader.PopBool(&status)) {
bool shutting_down;
if (!reader.PopBool(&shutting_down)) {
LOG(ERROR) << "Invalid signal: " << signal->ToString();
return;
}
if (status) {
if (shutting_down) {
if (!OnShutdown()) {
// The user didn't try to prevent shutdown. Release the lock and allow the
// shutdown to continue normally.