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

[jenirok] / src / gui / settingsdialog.cpp

diff --git a/src/gui/settingsdialog.cpp b/src/gui/settingsdialog.cpp
index f84f8c8..626a0b2 100644 (file)
--- a/src/gui/settingsdialog.cpp
+++ b/src/gui/settingsdialog.cpp
@@ -31,7 +31,7 @@
 #include "daemon.h"
 #include "cache.h"
 
-QMap <Eniro::Site, Eniro::SiteDetails> SettingsDialog::sites_ = Eniro::getSites();
+QMap <Eniro::Site, Eniro::SiteDetails> SettingsDialog::sites_;
 
 SettingsDialog::SettingsDialog(QWidget* parent): QDialog(parent),
 usernameInput_(0), passwordInput_(0), cacheInput_(0), siteSelector_(0),
@@ -62,6 +62,12 @@ autostartSelector_(0)
     siteSelector_ = new ButtonSelector(tr("Eniro site"), this);
     QString site = Settings::instance()->get("eniro_site");
     int i = 0;
+
+    if(sites_.empty())
+    {
+       sites_ = Eniro::getSites();
+    }
+
     QMap <Eniro::Site, Eniro::SiteDetails>::const_iterator it;
     for(it = sites_.begin(); it != sites_.end(); it++)
     {
@@ -150,18 +156,6 @@ void SettingsDialog::saveSettings()
         currentSite_ = site;
     }
 
-    if(autostart != currentAutostart_)
-    {
-        bool value = false;
-
-        if(autostart == "1")
-        {
-            value = true;
-        }
-
-        Daemon::setAutostart(value);
-    }
-
 }
 
 void SettingsDialog::setVisible(bool visible)
@@ -171,7 +165,6 @@ void SettingsDialog::setVisible(bool visible)
     if(visible)
     {
         currentSite_ = siteSelector_->value().toString();
-        currentAutostart_ = autostartSelector_->value().toString();
     }
 
 }