From 89d573450a17bea807a1e41bd4e38493cac4d8fe Mon Sep 17 00:00:00 2001 From: arcan1s Date: Tue, 1 Mar 2016 00:58:37 +0300 Subject: [PATCH] fix #81 As it was found the issue has been caused by parallel access to QGraphicsScene so it has been cleared before convertion to pixmap. It has been resolved by deletion concurrent updates in this place (it makes sense anyway). --- sources/awesome-widget/plugin/awkeys.cpp | 7 +++---- sources/awesomewidgets/graphicalitem.cpp | 2 -- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/sources/awesome-widget/plugin/awkeys.cpp b/sources/awesome-widget/plugin/awkeys.cpp index 9992060..5a1438f 100644 --- a/sources/awesome-widget/plugin/awkeys.cpp +++ b/sources/awesome-widget/plugin/awkeys.cpp @@ -229,10 +229,9 @@ void AWKeys::reinitKeys(const QStringList currentKeys) void AWKeys::updateTextData() { - QFuture text = QtConcurrent::run(m_threadPool, [this]() { - calculateValues(); - return parsePattern(keyOperator->pattern()); - }); + // do not do it in parallel to avoid race condition + calculateValues(); + QString text = parsePattern(keyOperator->pattern()); emit(needTextToBeUpdated(text)); emit(dataAggregator->updateData(values)); diff --git a/sources/awesomewidgets/graphicalitem.cpp b/sources/awesomewidgets/graphicalitem.cpp index b4908f4..1d9fba3 100644 --- a/sources/awesomewidgets/graphicalitem.cpp +++ b/sources/awesomewidgets/graphicalitem.cpp @@ -90,7 +90,6 @@ GraphicalItem *GraphicalItem::copy(const QString _fileName, const int _number) QString GraphicalItem::image(const QVariant &value) { qCDebug(LOG_LIB) << "Value" << value; - qDebug() << "Value" << value; m_scene->clear(); int scale[2] = {1, 1}; @@ -131,7 +130,6 @@ QString GraphicalItem::image(const QVariant &value) QString url = QString("") .arg(QString(byteArray.toBase64())); - qDebug() << url; return url; }