alecs/plasma-framework
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

don't crash when the applet fails to init

Browse Source
This commit is contained in:
Aaron Seigo 2011-09-22 18:27:55 +02:00
parent e8bcc257e1
commit a810cd2ab0
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
scriptengines/javascript/plasmoid/declarativeappletscript.cpp
View File

@ -66,6 +66,7 @@ QScriptValue constructKUrlClass(QScriptEngine *engine);
void registerSimpleAppletMetaTypes(QScriptEngine *engine); void registerSimpleAppletMetaTypes(QScriptEngine *engine);
DeclarativeAppletScript::DeclarativeAppletScript(QObject *parent, const QVariantList &args) DeclarativeAppletScript::DeclarativeAppletScript(QObject *parent, const QVariantList &args)
: AbstractJsAppletScript(parent, args), : AbstractJsAppletScript(parent, args),
m_interface(0),
m_engine(0), m_engine(0),
m_env(0), m_env(0),
m_auth(this) m_auth(this)
@ -118,7 +119,6 @@ bool DeclarativeAppletScript::init()
lay->addItem(m_declarativeWidget); lay->addItem(m_declarativeWidget);
} }
m_interface = 0;
if (pa) { if (pa) {
m_interface = new PopupAppletInterface(this); m_interface = new PopupAppletInterface(this);
} else if (cont) { } else if (cont) {
@ -492,6 +492,10 @@ QScriptValue DeclarativeAppletScript::loadService(QScriptContext *context, QScri
QList<QAction*> DeclarativeAppletScript::contextualActions() QList<QAction*> DeclarativeAppletScript::contextualActions()
{ {
if (!m_interface) {
return QList<QAction *>();
}
return m_interface->contextualActions(); return m_interface->contextualActions();
} }