Commit f42e54c0 authored by David Faure's avatar David Faure

Fix ServerManager going into Broken state when called before going to the event loop.

Symptom: zanshin was coming up empty when session-restored.

Test Plan: reboot with zanshin open

Reviewed By: dvratil
Differential Revision:

(cherry picked from commit 9cb74e71)
parent 1593c17d
......@@ -383,6 +383,11 @@ AgentManager *AgentManager::self()
AgentType::List AgentManager::types() const
// Maybe the Control process is up and ready but we haven't been to the event loop yet so serviceOwnerChanged wasn't called yet.
// In that case make sure to do it here, to avoid going into Broken state.
if (d->mTypes.isEmpty()) {
return Akonadi::valuesToVector(d->mTypes);
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment