projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fixing typo
[quassel.git]
/
src
/
core
/
core.cpp
diff --git
a/src/core/core.cpp
b/src/core/core.cpp
index
03a7f81
..
c894820
100644
(file)
--- 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.");
}
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;
@@
-913,7
+912,7
@@
void Core::changeUserPass(const QString &username) {
}
if(_configured && _storage->updateUser(userId, password)) {
}
if(_configured && _storage->updateUser(userId, password)) {
- out << "Password changed successfuly!" << endl;
+ out << "Password changed successful
l
y!" << endl;
} else {
qWarning() << "Failed to change password!";
}
} else {
qWarning() << "Failed to change password!";
}