arcanis/awesome-widgets
1
0
Fork 0
mirror of https://github.com/arcan1s/awesome-widgets.git synced 2025-07-13 13:55:50 +00:00
Code Issues Projects Releases Wiki Activity

fix crash which has been caused by the fact that we've called concurrent

Browse Source 
data update and don't copy object (#66)
* more correct concurrent run
* move data split to awdataengineaggregator
This commit is contained in:
arcan1s
2015-10-09 07:22:54 +03:00
parent 6f86e8ec5e
commit 827275da3f
5 changed files with 22 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
sources/awesome-widget/plugin/awdataengineaggregator.cpp
View File

@ -67,8 +67,8 @@ void AWDataEngineAggregator::connectVisualization()
qCDebug(LOG_AW);
// reconnectSources();
connect(this, SIGNAL(updateData(QString, QVariantMap)),
parent(), SLOT(dataUpdated(QString, QVariantMap)));
connect(this, SIGNAL(updateData(QString, QVariant, QString )),
parent(), SLOT(dataUpdated(QString, QVariant, QString)));
return static_cast<AWKeys *>(parent())->unlock();
}
@ -78,8 +78,8 @@ void AWDataEngineAggregator::disconnectVisualization()
{
qCDebug(LOG_AW);
disconnect(this, SIGNAL(updateData(QString, QVariantMap)),
parent(), SLOT(dataUpdated(QString, QVariantMap)));
disconnect(this, SIGNAL(updateData(QString, QVariant, QString)),
parent(), SLOT(dataUpdated(QString, QVariant, QString)));
// m_dataEngines.clear();
// HACK run timer in the main thread since a timer could not be started from
@ -94,7 +94,7 @@ void AWDataEngineAggregator::dropSource(const QString source)
qCDebug(LOG_AW) << "Source" << source;
// FIXME there is no possiblibity to check to which dataengine source connected
// we will try to disconnet it from systemmonitor and extsysmon
// we will try to disconnect it from systemmonitor and extsysmon
m_dataEngines[QString("systemmonitor")]->disconnectSource(source, this);
m_dataEngines[QString("extsysmon")]->disconnectSource(source, this);
}
@ -116,7 +116,12 @@ void AWDataEngineAggregator::dataUpdated(const QString sourceName, const Plasma:
qCDebug(LOG_AW) << "Source" << sourceName;
qCDebug(LOG_AW) << "Data" << data;
return emit(updateData(sourceName, data));
// HACK "deep copy" of data to avoid plasma crash on Data object destruction
QString units = data[QString("units")].toString();
// HACK workaround for time values which are stored in the different path
QVariant value = sourceName == QString("Local") ? data[QString("DateTime")] : data[QString("value")];
emit(updateData(sourceName, value, units));
}