Fix failure to reenter suspend/standby

This relates to Bug 1597
pull/1/head
Timothy Pearson 11 years ago
parent 67312e92f2
commit f956245ca2

@ -916,7 +916,11 @@ bool HardwareInfo::suspend( suspend_type suspend ) {
if (suspend_states.suspend2disk && (suspend_states.suspend2disk_allowed != 0)) { if (suspend_states.suspend2disk && (suspend_states.suspend2disk_allowed != 0)) {
if (rdevice->setPowerState(TDESystemPowerState::Hibernate)) { if (rdevice->setPowerState(TDESystemPowerState::Hibernate)) {
calledSuspend.start(); calledSuspend.start();
handleResumeSignal(0);
return true; return true;
} else {
handleResumeSignal(-1);
return false;
} }
} else { } else {
if ( !suspend_states.suspend2disk ) if ( !suspend_states.suspend2disk )
@ -931,8 +935,10 @@ bool HardwareInfo::suspend( suspend_type suspend ) {
if (suspend_states.suspend2ram && (suspend_states.suspend2ram_allowed != 0)) { if (suspend_states.suspend2ram && (suspend_states.suspend2ram_allowed != 0)) {
if (rdevice->setPowerState(TDESystemPowerState::Suspend)) { if (rdevice->setPowerState(TDESystemPowerState::Suspend)) {
calledSuspend.start(); calledSuspend.start();
handleResumeSignal(0);
return true; return true;
} else { } else {
handleResumeSignal(-1);
return false; return false;
} }
} else { } else {
@ -948,8 +954,10 @@ bool HardwareInfo::suspend( suspend_type suspend ) {
if (suspend_states.standby && (suspend_states.standby_allowed != 0)) { if (suspend_states.standby && (suspend_states.standby_allowed != 0)) {
if (rdevice->setPowerState(TDESystemPowerState::Standby)) { if (rdevice->setPowerState(TDESystemPowerState::Standby)) {
calledSuspend.start(); calledSuspend.start();
handleResumeSignal(0);
return true; return true;
} else { } else {
handleResumeSignal(-1);
return false; return false;
} }
} else { } else {

@ -1150,7 +1150,7 @@ void tdepowersave::handleSleepButtonEvent() {
/*! /*!
* Handle the event for the suspend2disk (hibernater) button and call the related action. * Handle the event for the suspend2disk (hibernater) button and call the related action.
*/ */
void tdepowersave::handleS2DiskButtonEvent(){ void tdepowersave::handleS2DiskButtonEvent() {
kdDebugFuncIn(trace); kdDebugFuncIn(trace);
// Only go to suspend on button event if we already resumed successful. // Only go to suspend on button event if we already resumed successful.

Loading…
Cancel
Save