poz/quickshell
1
0
Fork 0
forked from quickshell/quickshell
Code Pull requests Activity

core/scriptmodel: detatch mValues when accessed during update

Browse source 
Fixes iterator invalidation caused by the QML engine.
This commit is contained in:
outfoxxed 2025-04-06 01:40:55 -07:00
parent 3a97da0029
commit ed528268e0
Signed by untrusted user: outfoxxed
GPG key ID: 4C88A185FB89301E
2 changed files with 11 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/core/scriptmodel.cpp
View file

@ -12,6 +12,7 @@
#include <qvariant.h> #include <qvariant.h>
void ScriptModel::updateValuesUnique(const QVariantList& newValues) { void ScriptModel::updateValuesUnique(const QVariantList& newValues) {
this->hasActiveIterators = true;
this->mValues.reserve(newValues.size()); this->mValues.reserve(newValues.size());
auto iter = this->mValues.begin(); auto iter = this->mValues.begin();
@ -112,6 +113,8 @@ void ScriptModel::updateValuesUnique(const QVariantList& newValues) {
++newIter; ++newIter;
} }
} }
this->hasActiveIterators = false;
} }
void ScriptModel::setValues(const QVariantList& newValues) { void ScriptModel::setValues(const QVariantList& newValues) {

9
src/core/scriptmodel.hpp
View file

@ -70,7 +70,13 @@ class ScriptModel: public QAbstractListModel {
QML_ELEMENT; QML_ELEMENT;
public: public:
[[nodiscard]] const QVariantList& values() const { return this->mValues; } [[nodiscard]] QVariantList values() const {
auto values = this->mValues;
// If not detached, the QML engine will invalidate iterators in updateValuesUnique.
if (this->hasActiveIterators) values.detach();
return values;
}
void setValues(const QVariantList& newValues); void setValues(const QVariantList& newValues);
[[nodiscard]] qint32 rowCount(const QModelIndex& parent) const override; [[nodiscard]] qint32 rowCount(const QModelIndex& parent) const override;
@ -82,6 +88,7 @@ signals:
private: private:
QVariantList mValues; QVariantList mValues;
bool hasActiveIterators = false;
void updateValuesUnique(const QVariantList& newValues); void updateValuesUnique(const QVariantList& newValues);
}; };