From c6728be4e8c2c52ba62b4b0e54653df67e6549ec Mon Sep 17 00:00:00 2001 From: David Rowe Date: Wed, 4 Nov 2020 11:23:47 +1300 Subject: [PATCH] Fix enterEntity event not firing in entithy script after content reload --- .../entities-renderer/src/EntityTreeRenderer.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/libraries/entities-renderer/src/EntityTreeRenderer.cpp b/libraries/entities-renderer/src/EntityTreeRenderer.cpp index b5ed4b767d..3538f07d32 100644 --- a/libraries/entities-renderer/src/EntityTreeRenderer.cpp +++ b/libraries/entities-renderer/src/EntityTreeRenderer.cpp @@ -167,6 +167,13 @@ void EntityTreeRenderer::resetEntitiesScriptEngine() { auto entityScriptingInterface = DependencyManager::get(); entityScriptingInterface->setEntitiesScriptEngine(entitiesScriptEngineProvider); + connect(_entitiesScriptEngine.data(), &ScriptEngine::entityScriptPreloadFinished, [&](const EntityItemID& entityID) { + EntityItemPointer entity = getTree()->findEntityByID(entityID); + if (entity) { + entity->setScriptHasFinishedPreload(true); + } + }); + // Connect mouse events to entity script callbacks if (!_mouseAndPreloadSignalHandlersConnected) { @@ -205,13 +212,6 @@ void EntityTreeRenderer::resetEntitiesScriptEngine() { _entitiesScriptEngine->callEntityScriptMethod(entityID, "hoverLeaveEntity", event); }); - connect(_entitiesScriptEngine.data(), &ScriptEngine::entityScriptPreloadFinished, [&](const EntityItemID& entityID) { - EntityItemPointer entity = getTree()->findEntityByID(entityID); - if (entity) { - entity->setScriptHasFinishedPreload(true); - } - }); - _mouseAndPreloadSignalHandlersConnected = true; } }