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

Check for object existing when timer expiers not when starting timer

Browse Source 
Otherwise if it gets deleted in the meantime you'll still crash

Change-Id: If6dcf329eb5e43cff3b047f77c240d19427170ff
This commit is contained in:
David Edmundson 2015-03-12 17:03:41 +01:00
parent 01590d8fbc
commit 79a30ab7a3
1 changed files with 5 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/plasmaquick/dialog.cpp
View File

@ -337,9 +337,7 @@ void DialogPrivate::updateMinimumWidth()
q->contentItem()->setWidth(qMax(q->width(), minimumWidth)); q->contentItem()->setWidth(qMax(q->width(), minimumWidth));
q->setWidth(qMax(q->width(), minimumWidth)); q->setWidth(qMax(q->width(), minimumWidth));
if (mainItemLayout) { hintsCommitTimer.start();
hintsCommitTimer.start();
}
} }
void DialogPrivate::updateMinimumHeight() void DialogPrivate::updateMinimumHeight()
@ -365,9 +363,7 @@ void DialogPrivate::updateMinimumHeight()
q->contentItem()->setHeight(qMax(q->height(), minimumHeight)); q->contentItem()->setHeight(qMax(q->height(), minimumHeight));
q->setHeight(qMax(q->height(), minimumHeight)); q->setHeight(qMax(q->height(), minimumHeight));
if (mainItemLayout) { hintsCommitTimer.start();
hintsCommitTimer.start();
}
} }
void DialogPrivate::updateMaximumWidth() void DialogPrivate::updateMaximumWidth()
@ -389,9 +385,7 @@ void DialogPrivate::updateMaximumWidth()
q->contentItem()->setWidth(qMax(q->width(), maximumWidth)); q->contentItem()->setWidth(qMax(q->width(), maximumWidth));
q->setWidth(qMax(q->width(), maximumWidth)); q->setWidth(qMax(q->width(), maximumWidth));
if (mainItemLayout) { hintsCommitTimer.start();
hintsCommitTimer.start();
}
} }
void DialogPrivate::updateMaximumHeight() void DialogPrivate::updateMaximumHeight()
@ -413,14 +407,12 @@ void DialogPrivate::updateMaximumHeight()
q->contentItem()->setHeight(qMax(q->height(), maximumHeight)); q->contentItem()->setHeight(qMax(q->height(), maximumHeight));
q->setHeight(qMin(q->height(), maximumHeight)); q->setHeight(qMin(q->height(), maximumHeight));
if (mainItemLayout) { hintsCommitTimer.start();
hintsCommitTimer.start();
}
} }
void DialogPrivate::updateLayoutParameters() void DialogPrivate::updateLayoutParameters()
{ {
if (!componentComplete || !mainItem || !q->isVisible()) { if (!componentComplete || !mainItem || !q->isVisible() || !mainItemLayout) {
return; return;
} }
Q_ASSERT(mainItem); Q_ASSERT(mainItem);