Skip to content
Closed
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 11 additions & 6 deletions src/private/dbackdropnode.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -157,17 +157,22 @@ class Q_DECL_HIDDEN DataManager : public DataManagerBase
}
}

bool isValidData(const Data *data) const {
return dataList.contains(data);
}

inline QQuickWindow *owner() const {
return static_cast<QQuickWindow*>(parent());
}

Data *resolve(Data *data, DataKeys&&... keys) {
if (data && get()->check(data->data, std::forward<DataKeys>(keys)...)
&& dataList.contains(data)) {
return data;
if (isValidData(data)) {
if (data && get()->check(data->data, std::forward<DataKeys>(keys)...)) {
return data;
}
if (data)
release(data);
}
if (data)
release(data);

for (auto data : dataList) {
if (get()->check(data->data, std::forward<DataKeys>(keys)...)) {
Expand Down Expand Up @@ -706,7 +711,7 @@ class Q_DECL_HIDDEN RhiNode : public DBackdropNode {

if (oldManager != manager) {
sgTexture()->setTexture(nullptr);
if (oldManager && texture)
if (oldManager && oldManager->isValidData(texture))
oldManager->release(texture);
}

Expand Down