X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcore%2Fcore.cpp;h=c894820c61d6bf525a4352aae8074fc70f179009;hp=03a7f81f2a5273f4d3a9c7453200f6c6352e3cf3;hb=636812603e3308fece0ad677977c85b5cc9f18ee;hpb=a18fc9cf59a6329cb67d4eb7bd0197fceacdf7d8 diff --git a/src/core/core.cpp b/src/core/core.cpp index 03a7f81f..c894820c 100644 --- a/src/core/core.cpp +++ b/src/core/core.cpp @@ -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; @@ -913,7 +912,7 @@ void Core::changeUserPass(const QString &username) { } if(_configured && _storage->updateUser(userId, password)) { - out << "Password changed successfuly!" << endl; + out << "Password changed successfully!" << endl; } else { qWarning() << "Failed to change password!"; }