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

mainitem can be null according to the if() below, so respect that

Browse Source
This commit is contained in:
Aaron Seigo 2011-07-13 13:14:40 +02:00
parent dd95295cb0
commit 201baafc1c
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
declarativeimports/core/dialog.cpp
View File

@ -106,9 +106,11 @@ void DialogProxy::setMainItem(QGraphicsObject *mainItem)
{ {
if (m_mainItem.data() != mainItem) { if (m_mainItem.data() != mainItem) {
if (m_mainItem) { if (m_mainItem) {
m_mainItem.data()->setParent(mainItem->parent()); m_mainItem.data()->setParent(mainItem ? mainItem->parent() : 0);
} }
m_mainItem = mainItem; m_mainItem = mainItem;
if (mainItem) { if (mainItem) {
mainItem->setParentItem(0); mainItem->setParentItem(0);
mainItem->setParent(this); mainItem->setParent(this);