History

CR fixes

Thijs Wenker committed 8 years ago

Commit 74343c71 parent ba8d4454 files · +12 −8Browse 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+5−4
@@ -223,10 +223,11 @@ ScriptEngine::ScriptEngine(Context context, const QString& scriptContents, const · 222 unmodified lines
223223 if (_type == Type::ENTITY_CLIENT || _type == Type::ENTITY_SERVER) {
224224 QObject::connect(this, &ScriptEngine::update, this, [this]() {
225225 // process pending entity script content
226− if (_contentAvailableQueue.size()) {
227− auto pending = _contentAvailableQueue.values().toStdList();
228− _contentAvailableQueue.clear();
229− for (auto& args : pending) {
226+ if (!_contentAvailableQueue.empty()) {
227+ EntityScriptContentAvailableMap pending;
228+ std::swap(_contentAvailableQueue, pending);
229+ for (auto& pair : pending) {
230+ auto& args = pair.second;
230231 entityScriptContentAvailable(args.entityID, args.scriptOrURL, args.contents, args.isURL, args.success, args.status);
231232 }
232233 }