only check the config for immutability if we actually have it; immutability() gets called from setHasConfigurationInterface which gets called from AppletPrivate::init() which meant it was trying to access the configuration group too early, resulting in it being misplaced; for most applets this wouldn't matter, but for applets-in-applets (it's always the sinners) it causes problems

BUG:261264

svn path=/trunk/KDE/kdelibs/; revision=1209283
This commit is contained in:
Aaron J. Seigo 2010-12-26 10:42:57 +00:00
parent ab4e0e24d3
commit ae4f0579b9

View File

@ -882,7 +882,7 @@ ImmutabilityType Applet::immutability() const
// if this object is itself system immutable, then just return that; it's the most
// restrictive setting possible and will override anything that might be happening above it
// in the Corona->Containment->Applet hierarchy
if (d->transient || d->mainConfigGroup()->isImmutable()) {
if (d->transient || (d->mainConfig && d->mainConfig->isImmutable())) {
return SystemImmutable;
}