X-Git-Url: http://vcs.maemo.org/git/?a=blobdiff_plain;f=src%2Fdaemon%2Fmain.cpp;h=7dc2b014644f4e51735b0a12ff05fade7bc62ef6;hb=4c87b6256dcaa2fc16568fcdb4d7a83f840cccd1;hp=e069e26e9eabd1cc6d9f8d008858f8a625516fe8;hpb=8d5a300af1292568264137af8a7a32027ffb705a;p=jenirok

diff --git a/src/daemon/main.cpp b/src/daemon/main.cpp
index e069e26..7dc2b01 100644
--- a/src/daemon/main.cpp
+++ b/src/daemon/main.cpp
@@ -21,9 +21,20 @@
 #include <QtCore/QLocale>
 #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 not set
+    if(!(argc >= 2 && argv[1] == "manual"))
+    {
+        if(Settings::instance()->get("autostart") == "0")
+        {
+            // Autostart is disabled -> exit
+            return 0;
+        }
+    }
+
     QApplication app(argc, argv);
 
     QTranslator translator;