From 4670d21feb5721f909e3538d1bb83621d14233e9 Mon Sep 17 00:00:00 2001 From: "Aaron J. Seigo" Date: Wed, 10 Feb 2010 08:18:44 +0000 Subject: [PATCH] ensure the icon has an action before using it BUG:224944 svn path=/branches/KDE/4.4/kdelibs/; revision=1088114 --- private/desktoptoolbox.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/private/desktoptoolbox.cpp b/private/desktoptoolbox.cpp index 2bad27322..2c399a9cf 100644 --- a/private/desktoptoolbox.cpp +++ b/private/desktoptoolbox.cpp @@ -566,7 +566,9 @@ void DesktopToolBox::adjustToolBackerGeometry() (viewTransform().m11() == Plasma::scalingFactor(Plasma::DesktopZoom) || icon->action() == d->containment->action("add sibling containment") || icon->action() == d->containment->action("add widgets"))) { - icon->setText(icon->action()->text()); + if (icon->action()) { + icon->setText(icon->action()->text()); + } } else { icon->setText(QString()); }