History

don't block main thread for a script load

Stephen Birarda committed 11 years ago

Commit d7f16891 parent 36f716c4 files · +39 −22Browse files

Showing the changes to libraries/script-engine/src/ScriptEngine.cpp (1 of 4 files). Show all

Unified · Split

libraries/script-engine/src/ScriptEngine.cpp+4−3
@@ -177,10 +177,10 @@ void ScriptEngine::loadURL(const QUrl& scriptURL) { · 176 unmodified lines
177177 qDebug() << "Loading file:" << fileName;
178178 QTextStream in(&scriptFile);
179179 _scriptContents = in.readAll();
180− emit scriptLoaded();
180+ emit scriptLoaded(url);
181181 } else {
182182 qDebug() << "ERROR Loading file:" << fileName;
183− emit errorLoadingScript();
183+ emit errorLoadingScript(url);
184184 }
185185 } else {
186186 QNetworkAccessManager& networkAccessManager = NetworkAccessManager::getInstance();
@@ -195,9 +195,10 @@ void ScriptEngine::handleScriptDownload() { · 8 unmodified lines
195195
196196 if (reply->error() == QNetworkReply::NoError && reply->attribute(QNetworkRequest::HttpStatusCodeAttribute) == 200) {
197197 _scriptContents = reply->readAll();
198+ emit scriptLoaded(reply->url());
198199 } else {
199200 qDebug() << "ERROR Loading file:" << reply->url().toString();
200− emit errorLoadingScript();
201+ emit errorLoadingScript(reply->url());
201202 }
202203 }
203204