try and avoid, really hard, to allow constraintsUpdatedEvents before we get the StartupCompelted constraint through
svn path=/trunk/KDE/kdelibs/; revision=884053
This commit is contained in:
parent
a65daf42b2
commit
2de1e10c67
@ -1737,7 +1737,8 @@ AppletPrivate::AppletPrivate(KService::Ptr service, int uniqueID, Applet *applet
|
||||
isContainment(false),
|
||||
transient(false),
|
||||
ghost(false),
|
||||
needsConfig(false)
|
||||
needsConfig(false),
|
||||
started(false)
|
||||
{
|
||||
if (appletId == 0) {
|
||||
appletId = ++s_maxAppletId;
|
||||
@ -1889,10 +1890,14 @@ void AppletPrivate::scheduleConstraintsUpdate(Plasma::Constraints c)
|
||||
{
|
||||
// Don't start up a timer if we're just starting up
|
||||
// flushPendingConstraints will be called by Corona
|
||||
if (!constraintsTimerId && !(c & Plasma::StartupCompletedConstraint)) {
|
||||
if (started && !constraintsTimerId && !(c & Plasma::StartupCompletedConstraint)) {
|
||||
constraintsTimerId = q->startTimer(0);
|
||||
}
|
||||
|
||||
if (c & Plasma::StartupCompletedConstraint) {
|
||||
started = true;
|
||||
}
|
||||
|
||||
pendingConstraints |= c;
|
||||
}
|
||||
|
||||
|
@ -110,6 +110,7 @@ public:
|
||||
bool transient : 1;
|
||||
bool ghost : 1;
|
||||
bool needsConfig : 1;
|
||||
bool started : 1;
|
||||
};
|
||||
|
||||
} // Plasma namespace
|
||||
|
Loading…
Reference in New Issue
Block a user