yukijoou/kwin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'Plasma/5.2'

Browse source
This commit is contained in:
David Edmundson 2015-01-28 14:14:15 +01:00
commit da6d857d7a
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
kcmkwin/kwindecoration/declarative-plugin/previewitem.cpp
View file

@ -53,6 +53,7 @@ PreviewItem::PreviewItem(QQuickItem *parent)
PreviewItem::~PreviewItem() PreviewItem::~PreviewItem()
{ {
m_decoration->deleteLater();
if (m_bridge){ if (m_bridge){
m_bridge->unregisterPreviewItem(this); m_bridge->unregisterPreviewItem(this);
} }
@ -74,7 +75,7 @@ void PreviewItem::createDecoration()
if (m_bridge.isNull() || m_settings.isNull() || m_decoration) { if (m_bridge.isNull() || m_settings.isNull() || m_decoration) {
return; return;
} }
m_decoration = m_bridge->createDecoration(this); m_decoration = m_bridge->createDecoration(0);
if (!m_decoration) { if (!m_decoration) {
return; return;
} }