Fixes a timing issue when starting up plasma (could crash the whole plasma)
svn path=/trunk/KDE/kdelibs/; revision=880077
This commit is contained in:
parent
1a51d8f34e
commit
daf80c7f17
@ -1587,7 +1587,12 @@ void Applet::timerEvent(QTimerEvent *event)
|
||||
if (event->timerId() == d->constraintsTimerId) {
|
||||
killTimer(d->constraintsTimerId);
|
||||
d->constraintsTimerId = 0;
|
||||
flushPendingConstraintsEvents();
|
||||
|
||||
// Don't flushPendingConstraints if we're just starting up
|
||||
// flushPendingConstraints will be called by Corona
|
||||
if(!(d->pendingConstraints & Plasma::StartupCompletedConstraint)) {
|
||||
flushPendingConstraintsEvents();
|
||||
}
|
||||
} else if (event->timerId() == d->modificationsTimerId) {
|
||||
killTimer(d->modificationsTimerId);
|
||||
d->modificationsTimerId = 0;
|
||||
|
Loading…
Reference in New Issue
Block a user