Save a lookup in containmentActions

Also fixes an (arguably invalid) coverity warning

Change-Id: I1eebd475131b540517a7964c4ea9ec057a18c26f
This commit is contained in:
David Edmundson 2015-03-24 12:05:21 +01:00
parent fa3cd81597
commit d9dd89890a

View File

@ -508,14 +508,12 @@ void Containment::setContainmentActions(const QString &trigger, const QString &p
KConfigGroup cfg = d->containmentActionsConfig();
ContainmentActions *plugin = 0;
if (containmentActions().contains(trigger)) {
plugin = containmentActions().value(trigger);
if (plugin->pluginInfo().pluginName() != pluginName) {
if (plugin && plugin->pluginInfo().pluginName() != pluginName) {
containmentActions().remove(trigger);
delete plugin;
plugin = 0;
}
}
if (pluginName.isEmpty()) {
cfg.deleteEntry(trigger);