alecs/plasma-framework
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

don't try to load dataengines with and empty name

Browse Source
This commit is contained in:
Marco Martin 2014-04-02 11:12:11 +02:00
parent a08a3934f5
commit 857b0b8069
2 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/declarativeimports/core/datasource.cpp
View File

@ -96,6 +96,10 @@ void DataSource::setupData()
qDeleteAll(m_services); qDeleteAll(m_services);
m_services.clear(); m_services.clear();
if (m_engine.isEmpty()) {
return;
}
m_dataEngineConsumer = new Plasma::DataEngineConsumer(); m_dataEngineConsumer = new Plasma::DataEngineConsumer();
Plasma::DataEngine *engine = dataEngine(m_engine); Plasma::DataEngine *engine = dataEngine(m_engine);
if (!engine) { if (!engine) {

5
src/plasma/private/dataenginemanager.cpp
View File

@ -121,6 +121,10 @@ Plasma::DataEngine *DataEngineManager::engine(const QString &name) const
Plasma::DataEngine *DataEngineManager::loadEngine(const QString &name) Plasma::DataEngine *DataEngineManager::loadEngine(const QString &name)
{ {
if (name.isEmpty()) {
qDebug() << "Asked an engine with empty name";
return d->nullEngine();
}
Plasma::DataEngine::Dict::const_iterator it = d->engines.constFind(name); Plasma::DataEngine::Dict::const_iterator it = d->engines.constFind(name);
if (it != d->engines.constEnd()) { if (it != d->engines.constEnd()) {
@ -131,6 +135,7 @@ Plasma::DataEngine *DataEngineManager::loadEngine(const QString &name)
DataEngine *engine = PluginLoader::self()->loadDataEngine(name); DataEngine *engine = PluginLoader::self()->loadDataEngine(name);
if (!engine) { if (!engine) {
qDebug() << "Can't find a dataengine named" << name;
// Try installing the engine. However, it's too late for this request. // Try installing the engine. However, it's too late for this request.
ComponentInstaller::self()->installMissingComponent("dataengine", name); ComponentInstaller::self()->installMissingComponent("dataengine", name);