projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Implement core-side highlights
[quassel.git]
/
src
/
core
/
core.cpp
diff --git
a/src/core/core.cpp
b/src/core/core.cpp
index
1a418f1
..
d613e8f
100644
(file)
--- a/
src/core/core.cpp
+++ b/
src/core/core.cpp
@@
-403,10
+403,15
@@
bool Core::initStorage(const QString &backend, const QVariantMap &settings, bool
return false; // trigger setup process
if (storage->setup(settings))
return initStorage(backend, settings, false);
return false; // trigger setup process
if (storage->setup(settings))
return initStorage(backend, settings, false);
+ return false;
+
// if initialization wasn't successful, we quit to keep from coming up unconfigured
case Storage::NotAvailable:
qCritical() << "FATAL: Selected storage backend is not available:" << backend;
// if initialization wasn't successful, we quit to keep from coming up unconfigured
case Storage::NotAvailable:
qCritical() << "FATAL: Selected storage backend is not available:" << backend;
- exit(EXIT_FAILURE);
+ if (!setup)
+ exit(EXIT_FAILURE);
+ return false;
+
case Storage::IsReady:
// delete all other backends
_registeredStorageBackends.clear();
case Storage::IsReady:
// delete all other backends
_registeredStorageBackends.clear();
@@
-495,10
+500,15
@@
bool Core::initAuthenticator(const QString &backend, const QVariantMap &settings
return false; // trigger setup process
if (auth->setup(settings))
return initAuthenticator(backend, settings, false);
return false; // trigger setup process
if (auth->setup(settings))
return initAuthenticator(backend, settings, false);
+ return false;
+
// if initialization wasn't successful, we quit to keep from coming up unconfigured
case Authenticator::NotAvailable:
qCritical() << "FATAL: Selected auth backend is not available:" << backend;
// if initialization wasn't successful, we quit to keep from coming up unconfigured
case Authenticator::NotAvailable:
qCritical() << "FATAL: Selected auth backend is not available:" << backend;
- exit(EXIT_FAILURE);
+ if (!setup)
+ exit(EXIT_FAILURE);
+ return false;
+
case Authenticator::IsReady:
// delete all other backends
_registeredAuthenticators.clear();
case Authenticator::IsReady:
// delete all other backends
_registeredAuthenticators.clear();
@@
-862,7
+872,7
@@
bool Core::selectBackend(const QString &backend)
qDebug() << qPrintable(tr("Migrating storage backend %1 to %2...").arg(_storage->displayName(), storage->displayName()));
_storage.reset();
storage.reset();
qDebug() << qPrintable(tr("Migrating storage backend %1 to %2...").arg(_storage->displayName(), storage->displayName()));
_storage.reset();
storage.reset();
- if (reader->migrateTo(writer)) {
+ if (reader->migrateTo(writer
.get()
)) {
qDebug() << "Migration finished!";
qDebug() << qPrintable(tr("Migration finished!"));
if (!saveBackendSettings(backend, settings)) {
qDebug() << "Migration finished!";
qDebug() << qPrintable(tr("Migration finished!"));
if (!saveBackendSettings(backend, settings)) {