Some fixes to connection manager.

[jenirok] / src / common / enirocoreconfig.cpp

diff --git a/src/common/enirocoreconfig.cpp b/src/common/enirocoreconfig.cpp
index e272bce..8c09152 100644 (file)
--- a/src/common/enirocoreconfig.cpp
+++ b/src/common/enirocoreconfig.cpp
@@ -65,7 +65,9 @@ void EniroCoreConfig::getConfig(QMap<QString, QString>& config)
 {
     load();
 
-    config = config_;
+    config[USERNAME_COLUMN] = config_[USERNAME_COLUMN];
+    config[PASSWORD_COLUMN] = config_[PASSWORD_COLUMN];
+    config[SITE_COLUMN] = config_[SITE_COLUMN];
 }
 
 void EniroCoreConfig::loadFromConfig(QMap<QString, QString> const& config)
@@ -88,6 +90,11 @@ bool EniroCoreConfig::readyToSearch()
 {
     load();
 
+    if(config_[SITE_COLUMN] != "fi")
+    {
+        return true;
+    }
+
     return !config_[USERNAME_COLUMN].isEmpty() && !config_[PASSWORD_COLUMN].isEmpty();
 }