Mirrors/overte-lubosz
3
0
Fork 0
mirror of https://github.com/lubosz/overte.git synced 2025-04-26 23:35:33 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request from huffman/19788

Browse source 
Code Review for Job
This commit is contained in:
Brad Hefta-Gaub 2014-06-17 16:28:03 -07:00
commit df27de3c73
2 changed files with 8 additions and 2 deletions
interface/src
Application.cpp
libraries/script-engine/src
ScriptEngine.cpp

3
interface/src/Application.cpp
View file

@ -3523,12 +3523,13 @@ ScriptEngine* Application::loadScript(const QString& scriptName, bool loadScript
} else {
// start the script on a new thread...
scriptEngine = new ScriptEngine(scriptUrl, &_controllerScriptingInterface);
_scriptEnginesHash.insert(scriptURLString, scriptEngine);
if (!scriptEngine->hasScript()) {
qDebug() << "Application::loadScript(), script failed to load...";
return NULL;
}
_scriptEnginesHash.insert(scriptURLString, scriptEngine);
_runningScriptsWidget->setRunningScripts(getRunningScripts());
}

7
libraries/script-engine/src/ScriptEngine.cpp
View file

@ -147,7 +147,12 @@ ScriptEngine::ScriptEngine(const QUrl& scriptURL,
QEventLoop loop;
QObject::connect(reply, SIGNAL(finished()), &loop, SLOT(quit()));
loop.exec();
_scriptContents = reply->readAll();
if (reply->error() == QNetworkReply::NoError && reply->attribute(QNetworkRequest::HttpStatusCodeAttribute) == 200) {
_scriptContents = reply->readAll();
} else {
qDebug() << "ERROR Loading file:" << url.toString();
emit errorMessage("ERROR Loading file:" + url.toString());
}
}
}
}