Commit 340a1236 authored by Friedrich W. H. Kossebau's avatar Friedrich W. H. Kossebau

Merge branch '5.4'

parents 2acd7482 c3c9ea8a
......@@ -427,6 +427,11 @@ void Core::cleanup()
// before unloading language plugins, we need to make sure all parse jobs are done
d->languageController->backgroundParser()->waitForIdle();
DUChain::self()->shutdown();
// Only unload plugins after the DUChain shutdown to prevent issues with non-loaded factories for types
// See: https://bugs.kde.org/show_bug.cgi?id=379669
d->pluginController->cleanup();
d->sessionController->cleanup();
......@@ -435,8 +440,6 @@ void Core::cleanup()
//Disable the functionality of the language controller
d->languageController->cleanup();
DUChain::self()->shutdown();
}
d->m_cleanedUp = true;
......
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