Change-Id: Ib7698dfe3880e23355fd1c0acfcc3de2cc7c4d2d
This commit is contained in:
Marco Martin 2014-10-31 18:11:16 +01:00
parent 78ab028d52
commit 72b9a37fe9
2 changed files with 2 additions and 2 deletions

View File

@ -196,7 +196,7 @@ void CoronaTest::addRemoveApplets()
//remove action present //remove action present
QVERIFY(m_corona->containments().first()->applets().first()->actions()->action("remove")); QVERIFY(m_corona->containments().first()->applets().first()->actions()->action("remove"));
//kill an applet //kill an applet
m_corona->containments().first()->applets().first()->actions()->action("remove")->trigger(); m_corona->containments().first()->applets().first()->destroy();
QSignalSpy spy(m_corona->containments().first()->applets().first(), SIGNAL(destroyed())); QSignalSpy spy(m_corona->containments().first()->applets().first(), SIGNAL(destroyed()));
QVERIFY(spy.wait(1000)); QVERIFY(spy.wait(1000));

View File

@ -222,7 +222,7 @@ void AppletPrivate::showConfigurationRequiredMessage(bool show, const QString &r
void AppletPrivate::askDestroy() void AppletPrivate::askDestroy()
{ {
if (q->immutability() != Types::Mutable || transient || !started) { if (q->immutability() != Types::Mutable || !started) {
return; //don't double delete return; //don't double delete
} }