X-Git-Url: http://git.maemo.org/git/?p=jenirok;a=blobdiff_plain;f=src%2Fdaemon%2Fmain.cpp;h=a07d28ed3fe8d427cd163506800de1e3dc69ae62;hp=e069e26e9eabd1cc6d9f8d008858f8a625516fe8;hb=3cf99b9a19050f2fdde9ffd69af65a7d58576ca1;hpb=89496ceee9788c2908c27ad4e2535f2728310d76

diff --git a/src/daemon/main.cpp b/src/daemon/main.cpp
index e069e26..a07d28e 100644
--- a/src/daemon/main.cpp
+++ b/src/daemon/main.cpp
@@ -19,11 +19,25 @@
 #include <QtCore/QCoreApplication>
 #include <QtCore/QTranslator>
 #include <QtCore/QLocale>
+#include <QtCore/QString>
+#include <QtCore/QList>
+#include <QDebug>
 #include <QtGui/QApplication>
 #include "calllistener.h"
+#include "settings.h"
 
 int main(int argc, char *argv[])
 {
+    // If daemon was started on boot, the first parameter is set to "-boot"
+    if(argc >= 2 && QString(argv[1]) == "-boot")
+    {
+        if(Settings::instance()->get("autostart") == "0")
+        {
+            // Autostart is disabled -> exit
+            return 0;
+        }
+    }
+
     QApplication app(argc, argv);
 
     QTranslator translator;