History

Merge branch 'protocol' of https://github.com/birarda/hifi into protocol

Atlante45 committed 11 years ago

Commit bbb00b92 parents 81ad005 821c16c100 files · +2899 −1212Browse files

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

Unified · Split

libraries/script-engine/src/ScriptEngine.cpp+7−1
@@ -710,7 +710,13 @@ void ScriptEngine::run() { · 709 unmodified lines
710710
711711 // since we're in non-threaded mode, call process so that the packets are sent
712712 if (!entityScriptingInterface->getEntityPacketSender()->isThreaded()) {
713− entityScriptingInterface->getEntityPacketSender()->process();
713+ // wait here till the edit packet sender is completely done sending
714+ while (entityScriptingInterface->getEntityPacketSender()->hasPacketsToSend()) {
715+ entityScriptingInterface->getEntityPacketSender()->process();
716+ QCoreApplication::processEvents();
717+ }
718+ } else {
719+ // FIXME - do we need to have a similar "wait here" loop for non-threaded packet senders?
714720 }
715721 }
716722