From f93fb9195de28011ef37787a0e797db1bbf523f4 Mon Sep 17 00:00:00 2001 From: Marco Martin Date: Thu, 28 Aug 2014 16:49:03 +0200 Subject: [PATCH] don't crash with invalid applets simple error message --- plasma-windowed/plasmawindowedcorona.cpp | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/plasma-windowed/plasmawindowedcorona.cpp b/plasma-windowed/plasmawindowedcorona.cpp index 23bc60384..3dee2834d 100644 --- a/plasma-windowed/plasmawindowedcorona.cpp +++ b/plasma-windowed/plasmawindowedcorona.cpp @@ -65,6 +65,11 @@ void PlasmaWindowedCorona::loadApplet(const QString &applet, const QVariantList if (plugin == applet) { Plasma::Applet *a = Plasma::PluginLoader::self()->loadApplet(applet, group.toInt(), arguments); + if (!a) { + qWarning() << "Unable to load applet" << applet << "with arguments" <deleteLater(); + return; + } a->restore(cg); //Access a->config() before adding to containment @@ -79,6 +84,12 @@ void PlasmaWindowedCorona::loadApplet(const QString &applet, const QVariantList } Plasma::Applet *a = Plasma::PluginLoader::self()->loadApplet(applet, 0, arguments); + if (!a) { + qWarning() << "Unable to load applet" << applet << "with arguments" <deleteLater(); + return; + } + //Access a->config() before adding to containment //will cause applets to be saved in palsmawindowedrc //so applets will only be created on demand