Differential D16425 Diff 44208 daemon/actions/bundled/suspendsession.cpp

Changeset View

Standalone View

View Options

daemon/actions/bundled/suspendsession.cpp

Context not available.
111 111​
112 const auto mode = static_cast<Mode>(args["Type"].toUInt()); 112​ const auto mode = static_cast<Mode>(args["Type"].toUInt());
113 113​
114 if (mode == ToRamMode || mode == ToDiskMode || mode == SuspendHybridMode) { 114​ if (mode == ToRamMode || mode == ToDiskMode || mode == SuspendHybridMode || mode == SuspendThenHibernateMode) {
115 // don't suspend if shutting down 115​ // don't suspend if shutting down
116 if (KWorkSpace::isShuttingDown()) { 116​ if (KWorkSpace::isShuttingDown()) {
117 qCDebug(POWERDEVIL) << "Not suspending because a shutdown is in progress"; 117​ qCDebug(POWERDEVIL) << "Not suspending because a shutdown is in progress";
abalajiUnsubmitted
Done

How about avoiding the duplicate suspendJob = backend()->suspend() calls by doing:

suspendJob = backend()->suspend(m_suspendThenHibernateEnabled 
 ? PowerDevil::BackendInterface::SuspendThenHibernate : PowerDevil::BackendInterface::ToRam);
abalaji: How about avoiding the duplicate `suspendJob = backend()->suspend()` calls by doing: ```…
Context not available.
144 Q_EMIT aboutToSuspend(); 144​ Q_EMIT aboutToSuspend();
145 suspendJob = backend()->suspend(PowerDevil::BackendInterface::HybridSuspend); 145​ suspendJob = backend()->suspend(PowerDevil::BackendInterface::HybridSuspend);
146 break; 146​ break;
147​ case SuspendThenHibernateMode:
148​ Q_EMIT aboutToSuspend();
149​ suspendJob = backend()->suspend(PowerDevil::BackendInterface::SuspendThenHibernate);
150​ break;
147 case ShutdownMode: 151​ case ShutdownMode:
148 KWorkSpace::requestShutDown(KWorkSpace::ShutdownConfirmNo, KWorkSpace::ShutdownTypeHalt); 152​ KWorkSpace::requestShutDown(KWorkSpace::ShutdownConfirmNo, KWorkSpace::ShutdownTypeHalt);
149 break; 153​ break;
abalajiUnsubmitted
Done

Factor the config.isValid() out of the two if statements

abalaji: Factor the `config.isValid()` out of the two `if` statements
Context not available.
198 triggerSuspendSession(ToRamMode); 202​ triggerSuspendSession(ToRamMode);
199} 203​}
200 204​
205​void SuspendSession::suspendThenHibernate()
206​{
207​ triggerSuspendSession(SuspendThenHibernateMode);
208​}
209​
201void SuspendSession::triggerSuspendSession(uint action) 210​void SuspendSession::triggerSuspendSession(uint action)
202{ 211​{
203 trigger({ 212​ trigger({
Context not available.