mirror of
https://bitbucket.org/smil3y/kde-extraapps.git
synced 2025-02-23 10:22:52 +00:00
kdeplasma-addons: fix plasmaweather busy timer races
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
This commit is contained in:
parent
cd3321bf6f
commit
3edb2cc356
1 changed files with 6 additions and 5 deletions
|
@ -78,8 +78,8 @@ public:
|
|||
q->setConfigurationRequired(false);
|
||||
} else {
|
||||
busyTimer->stop();
|
||||
q->showMessage(QIcon(), QString(), Plasma::ButtonNone);
|
||||
q->setBusy(false);
|
||||
q->showMessage(QIcon(), QString(), Plasma::ButtonNone);
|
||||
q->setConfigurationRequired(true);
|
||||
}
|
||||
|
||||
|
@ -205,15 +205,16 @@ void WeatherPopupApplet::connectToEngine()
|
|||
connect(d->location, SIGNAL(finished(QString)), this, SLOT(locationReady(QString)));
|
||||
}
|
||||
|
||||
d->busyTimer->stop();
|
||||
setBusy(false);
|
||||
d->location->setDataEngines(dataEngine(QLatin1String( "geolocation" )), d->weatherEngine);
|
||||
d->location->getDefault();
|
||||
setBusy(false);
|
||||
} else {
|
||||
delete d->location;
|
||||
d->location = 0;
|
||||
d->weatherEngine->connectSource(d->source, this, d->updateInterval * 60 * 1000);
|
||||
setBusy(true);
|
||||
d->busyTimer->start();
|
||||
setBusy(true);
|
||||
d->weatherEngine->connectSource(d->source, this, d->updateInterval * 60 * 1000);
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -303,8 +304,8 @@ void WeatherPopupApplet::dataUpdated(const QString& source,
|
|||
setAssociatedApplicationUrls(KUrl(data.value(QLatin1String( "Credit Url" )).toString()));
|
||||
|
||||
d->busyTimer->stop();
|
||||
showMessage(QIcon(), QString(), Plasma::ButtonNone);
|
||||
setBusy(false);
|
||||
showMessage(QIcon(), QString(), Plasma::ButtonNone);
|
||||
}
|
||||
|
||||
QString WeatherPopupApplet::pressureUnit()
|
||||
|
|
Loading…
Add table
Reference in a new issue