Fixed an error in settings dialog that caused app to segfault on arm. Changed init...

[jenirok] / src / daemon / main.cpp

diff --git a/src/daemon/main.cpp b/src/daemon/main.cpp
index e069e26..7dc2b01 100644 (file)
--- 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;