Move the clearFocus() fix to before "delete d", since we delete containments in ~CoronaPrivate

svn path=/trunk/KDE/kdebase/workspace/libs/plasma/; revision=852814
This commit is contained in:
Alex Merry 2008-08-26 17:25:04 +00:00
parent d362e7989c
commit df4423255f

View File

@ -186,17 +186,17 @@ Corona::Corona(QObject *parent)
Corona::~Corona() Corona::~Corona()
{ {
// FIXME: Same fix as in Plasma::View - make sure that when the focused widget is
// destroyed we don't try to transfer it to something that's already been
// deleted.
clearFocus();
KConfigGroup cg(config(), "General"); KConfigGroup cg(config(), "General");
// we call the dptr member directly for locked since isImmutable() // we call the dptr member directly for locked since isImmutable()
// also checks kiosk and parent containers // also checks kiosk and parent containers
cg.writeEntry("immutability", (int)d->immutability); cg.writeEntry("immutability", (int)d->immutability);
delete d; delete d;
// FIXME: Same fix as in Plasma::View - make sure that when the focused widget is
// destroyed we don't try to transfer it to something that's already been
// deleted.
clearFocus();
} }
void Corona::setAppletMimeType(const QString& type) void Corona::setAppletMimeType(const QString& type)