Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-06 19:59:28 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Make sure we call allReferencesCleared on the right thread.

Browse source
This commit is contained in:
Andrzej Kapolka 2014-04-17 11:13:22 -07:00
parent 197ce036c4
commit 58b063ee12
2 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
libraries/shared/src/ResourceCache.cpp
View file

@ -12,6 +12,7 @@
#include <cfloat> #include <cfloat>
#include <cmath> #include <cmath>
#include <QThread>
#include <QTimer> #include <QTimer>
#include <QtDebug> #include <QtDebug>
@ -174,6 +175,10 @@ float Resource::getLoadPriority() {
} }
void Resource::allReferencesCleared() { void Resource::allReferencesCleared() {
if (QThread::currentThread() != thread()) {
QMetaObject::invokeMethod(this, "allReferencesCleared");
return;
}
if (_cache) { if (_cache) {
// create and reinsert new shared pointer // create and reinsert new shared pointer
QSharedPointer<Resource> self(this, &Resource::allReferencesCleared); QSharedPointer<Resource> self(this, &Resource::allReferencesCleared);

2
libraries/shared/src/ResourceCache.h
View file

@ -123,7 +123,7 @@ public:
void setCache(ResourceCache* cache) { _cache = cache; } void setCache(ResourceCache* cache) { _cache = cache; }
void allReferencesCleared(); Q_INVOKABLE void allReferencesCleared();
protected slots: protected slots: