summaryrefslogtreecommitdiff
path: root/core/launcher/desktop.cpp
Side-by-side diff
Diffstat (limited to 'core/launcher/desktop.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r--core/launcher/desktop.cpp58
1 files changed, 34 insertions, 24 deletions
diff --git a/core/launcher/desktop.cpp b/core/launcher/desktop.cpp
index f90da1a..7f24259 100644
--- a/core/launcher/desktop.cpp
+++ b/core/launcher/desktop.cpp
@@ -604,30 +604,40 @@ static void darkScreen()
void Desktop::togglePower()
{
- bool wasloggedin = loggedin;
- loggedin=0;
- suspendTime = QDateTime::currentDateTime();
- darkScreen();
- if ( wasloggedin )
- blankScreen();
-
- system("apm --suspend");
-
-
-
- QWSServer::screenSaverActivate( FALSE );
- {
- QCopEnvelope("QPE/Card", "mtabChanged()" ); // might have changed while asleep
- QCopEnvelope e("QPE/System", "setBacklight(int)");
- e << -3; // Force on
- }
- if ( wasloggedin ) {
- login(TRUE);
- }
- sleep(1);
- execAutoStart();
- //qcopBridge->closeOpenConnections();
- //qDebug("called togglePower()!!!!!!");
+ static bool excllock = false;
+
+ if ( excllock )
+ return;
+
+ excllock = true;
+
+ bool wasloggedin = loggedin;
+ loggedin=0;
+ suspendTime = QDateTime::currentDateTime();
+ darkScreen();
+ if ( wasloggedin )
+ blankScreen();
+
+ ODevice::inst ( )-> suspend ( );
+
+ QWSServer::screenSaverActivate( FALSE );
+
+ {
+ QCopEnvelope("QPE/Card", "mtabChanged()" ); // might have changed while asleep
+ QCopEnvelope e("QPE/System", "setBacklight(int)");
+ e << -3; // Force on
+ }
+
+ if ( wasloggedin )
+ login(TRUE);
+
+ execAutoStart();
+ //qcopBridge->closeOpenConnections();
+ //qDebug("called togglePower()!!!!!!");
+
+ qApp-> processEvents ( );
+
+ excllock = false;
}
void Desktop::toggleLight()