History

Merge pull request #4072 from Atlante45/network_replies_cleanup

Windows crash fix

Philip Rosedale committed 11 years ago

Commit 285e5882 parents 22a609f 441a1e414 files · +45 −6Browse files

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

Unified · Split

libraries/script-engine/src/ScriptEngine.cpp+3−0
@@ -194,6 +194,8 @@ void ScriptEngine::handleScriptDownload() { · 193 unmodified lines
194 qDebug() << "ERROR Loading file:" << reply->url().toString();194 qDebug() << "ERROR Loading file:" << reply->url().toString();
195 emit errorLoadingScript(_fileNameString);195 emit errorLoadingScript(_fileNameString);
196 }196 }
197
198 reply->deleteLater();
197}199}
198 200
199void ScriptEngine::init() {201void ScriptEngine::init() {
@@ -605,6 +607,7 @@ void ScriptEngine::include(const QString& includeFile) { · 405 unmodified lines
605 QObject::connect(reply, SIGNAL(finished()), &loop, SLOT(quit()));607 QObject::connect(reply, SIGNAL(finished()), &loop, SLOT(quit()));
606 loop.exec();608 loop.exec();
607 includeContents = reply->readAll();609 includeContents = reply->readAll();
610 reply->deleteLater();
608 } else {611 } else {
609#ifdef _WIN32612#ifdef _WIN32
610 QString fileName = url.toString();613 QString fileName = url.toString();