X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fcore%2Fcore.cpp;h=f9b08dfad1413bd64859a1b88aa67d51578d152a;hb=6e02e38993d9b2d3c5e36359dcb6f6969e4caf39;hp=29174b62b7ba973a18b8ffa1b4d4905fa49ebfcc;hpb=93f0cb7e4e4889e80994e570d714df46c86e1844;p=quassel.git diff --git a/src/core/core.cpp b/src/core/core.cpp index 29174b62..f9b08dfa 100644 --- 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["Backend"] = _storageBackends[_storageBackends.keys().first()]->displayName(); + setupData["Backend"] = QString("SQLite"); // mono client currently needs sqlite 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."); } - _configured = initStorage(setupData, true); - if(!_configured) { + if(_configured || !(_configured = initStorage(setupData, true))) { return tr("Could not setup storage!"); } CoreSettings s;