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;
- exit(EXIT_FAILURE);
+ if (!setup)
+ exit(EXIT_FAILURE);
+ return false;
+
case Storage::IsReady:
// delete all other backends
_registeredStorageBackends.clear();
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;
- exit(EXIT_FAILURE);
+ if (!setup)
+ exit(EXIT_FAILURE);
+ return false;
+
case Authenticator::IsReady:
// delete all other backends
_registeredAuthenticators.clear();
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)) {