Properly reject invalid handshake data

[quassel.git] / src / core / core.cpp

diff --git a/src/core/core.cpp b/src/core/core.cpp
index 29174b6..f9b08df 100644 (file)
--- a/src/core/core.cpp
+++ b/src/core/core.cpp
@@ -262,7 +262,7 @@ QString Core::setupCoreForInternalUsage() {
   }
   setupData["AdminUser"] = "AdminUser";
   setupData["AdminPasswd"] = QString::number(pass);
   }
   setupData["AdminUser"] = "AdminUser";
   setupData["AdminPasswd"] = QString::number(pass);

-  setupData["Backend"] = _storageBackends[_storageBackends.keys().first()]->displayName();
+  setupData["Backend"] = QString("SQLite"); // mono client currently needs sqlite

   return setupCore(setupData);
 }
 
   return setupCore(setupData);
 }
 


@@ -272,8 +272,7 @@ QString Core::setupCore(QVariantMap setupData) {
   if(user.isEmpty() || password.isEmpty()) {
     return tr("Admin user or password not set.");
   }
   if(user.isEmpty() || password.isEmpty()) {
     return tr("Admin user or password not set.");
   }

-  _configured = initStorage(setupData, true);
-  if(!_configured) {
+  if(_configured || !(_configured = initStorage(setupData, true))) {

     return tr("Could not setup storage!");
   }
   CoreSettings s;
     return tr("Could not setup storage!");
   }
   CoreSettings s;