From 0f8d4513c0ad7423d1643385049afd70fa9b30ce Mon Sep 17 00:00:00 2001 From: Robert Griebl Date: Wed, 10 Feb 2021 15:53:41 +0100 Subject: Ignore unparseable info.yaml manifest file Otherwise a broken 3rd party manifest could prevent the startup of the system-ui. This is a regression that was introduced when we implemented the caching mechanism for manifests. Change-Id: I723a2fa741afff95fbe7f54b46cbed61ecc5b37e Pick-to: 5.15 Reviewed-by: Dominik Holland --- src/main-lib/configuration.cpp | 2 ++ 1 file changed, 2 insertions(+) (limited to 'src/main-lib') diff --git a/src/main-lib/configuration.cpp b/src/main-lib/configuration.cpp index 7d85eff5..be364f4f 100644 --- a/src/main-lib/configuration.cpp +++ b/src/main-lib/configuration.cpp @@ -332,6 +332,8 @@ void Configuration::parseWithArguments(const QStringList &arguments) try { cache.parse(); m_data.reset(cache.takeMergedResult()); + if (m_data.isNull()) + m_data.reset(new ConfigurationData()); } catch (const Exception &e) { showParserMessage(e.errorString() + qL1C('\n'), ErrorMessage); exit(1); -- cgit v1.2.1