1 files changed, 11 insertions, 2 deletions

diff --git a/core/launcher/desktop.cpp b/core/launcher/desktop.cpp
index cf33011..43006f1 100644
--- a/core/launcher/desktop.cpp
+++ b/core/launcher/desktop.cpp
@@ -35,6 +35,7 @@
 #include <qpe/password.h>
 #include <qpe/config.h>
 #include <qpe/power.h>
+#include <qpe/timeconversion.h>
 #include <qpe/qcopenvelope_qws.h>
 #include <qpe/global.h>
 #ifdef QT_QWS_CUSTOM
@@ -547,14 +548,21 @@ void Desktop::raiseEmail()
 }
 
 // autoStarts apps on resume and start
-void Desktop::execAutoStart()
-{
+void Desktop::execAutoStart() {
   QString appName;
+    int delay;
+    QDateTime now = QDateTime::currentDateTime();
   Config cfg( "autostart" );
   cfg.setGroup( "AutoStart" );
   appName = cfg.readEntry("Apps", "");
+    delay = (cfg.readEntry("Delay", "0" )).toInt();
+    // If the time between suspend and resume was longer then the
+    // value saved as delay, start the app
+    if ( suspendTime.secsTo(now) >= (delay*60) ) {
   QCopEnvelope e("QPE/System", "execute(QString)");
   e << QString(appName);
+    } else {
+    }
 }
 
 #if defined(QPE_HAVE_TOGGLELIGHT)
@@ -593,6 +601,7 @@ void Desktop::togglePower()
 {
   bool wasloggedin = loggedin;
   loggedin=0;
+  suspendTime = QDateTime::currentDateTime();
   darkScreen();
   if ( wasloggedin )
     blankScreen();