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

Merge pull request #8947 from huffman/fix/script-include-race

Browse source 
Fix race condition in BatchLoader
This commit is contained in:
Chris Collins 2016-10-28 16:17:46 -07:00 committed by GitHub
commit 1ba5a5d5d7
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -56,10 +56,6 @@ void BatchLoader::start() {
// 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(scriptCache.data());
scriptCache->getScriptContents(url.toString(), [proxy](const QString& url, const QString& contents, bool isURL, bool success) {
proxy->receivedContent(url, contents, isURL, success);
proxy->deleteLater();
}, false);
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) {
@ -75,6 +71,11 @@ void BatchLoader::start() {
emit finished(_data); emit finished(_data);
} }
}); });
scriptCache->getScriptContents(url.toString(), [proxy](const QString& url, const QString& contents, bool isURL, bool success) {
proxy->receivedContent(url, contents, isURL, success);
proxy->deleteLater();
}, false);
} }
} }