Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-06-05 10:50:28 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'upstream/master' into script-retry-improvements

Browse source
This commit is contained in:
humbletim 2016-11-06 11:36:50 -05:00
commit 144983a943
3 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
libraries/script-engine/src/BatchLoader.cpp
View file

@ -55,7 +55,8 @@ void BatchLoader::start() {
// Use a proxy callback to handle the call and emit the signal in a thread-safe way. // Use a proxy callback to handle the call and emit the signal in a thread-safe way.
// If BatchLoader is deleted before the callback is called, the subsequent "emit" call will not do // If BatchLoader is deleted before the callback is called, the subsequent "emit" call will not do
// anything. // anything.
ScriptCacheSignalProxy* proxy = new ScriptCacheSignalProxy(scriptCache.data()); ScriptCacheSignalProxy* proxy = new ScriptCacheSignalProxy();
connect(scriptCache.data(), &ScriptCache::destroyed, proxy, &ScriptCacheSignalProxy::deleteLater);
connect(proxy, &ScriptCacheSignalProxy::contentAvailable, this, [this](const QString& url, const QString& contents, bool isURL, bool success) { connect(proxy, &ScriptCacheSignalProxy::contentAvailable, this, [this](const QString& url, const QString& contents, bool isURL, bool success) {
if (isURL && success) { if (isURL && success) {

1
libraries/script-engine/src/BatchLoader.h
View file

@ -24,7 +24,6 @@
class ScriptCacheSignalProxy : public QObject { class ScriptCacheSignalProxy : public QObject {
Q_OBJECT Q_OBJECT
public: public:
ScriptCacheSignalProxy(QObject* parent) : QObject(parent) { }
void receivedContent(const QString& url, const QString& contents, bool isURL, bool success); void receivedContent(const QString& url, const QString& contents, bool isURL, bool success);
signals: signals:

3
libraries/script-engine/src/ScriptCache.cpp
View file

@ -229,6 +229,9 @@ void ScriptCache::scriptContentAvailable() {
}); });
} else { } else {
// Dubious, but retained here because it matches the behavior before fixing the threading // Dubious, but retained here because it matches the behavior before fixing the threading
allCallbacks = scriptRequest.scriptUsers;
scriptContent = _scriptCache[url]; scriptContent = _scriptCache[url];
finished = true; finished = true;
qCWarning(scriptengine) << "Error loading script from URL " << url; qCWarning(scriptengine) << "Error loading script from URL " << url;