Showing the changes to assignment-client/src/scripts/EntityScriptServer.cpp (1 of 2 files). Show all
Unified · Split
| @@ -254,7 +254,7 @@ void EntityScriptServer::clear() { · 253 unmodified lines | ||
| 254 | 254 | _entityViewer.clear(); |
| 255 | 255 | } |
| 256 | 256 | |
| 257 | −void EntityScriptServer::shutdown() { | |
| 257 | +void EntityScriptServer::shutdownScriptEngine() { | |
| 258 | 258 | if (_entitiesScriptEngine) { |
| 259 | 259 | _entitiesScriptEngine->disconnectNonEssentialSignals(); // disconnect all slots/signals from the script engine, except essential |
| 260 | 260 | } |
| @@ -351,6 +351,8 @@ void EntityScriptServer::handleJurisdictionPacket(QSharedPointer<ReceivedMessage · 90 unmodified lines | ||
| 351 | 351 | } |
| 352 | 352 | |
| 353 | 353 | void EntityScriptServer::aboutToFinish() { |
| 354 | + shutdownScriptEngine(); | |
| 355 | + | |
| 354 | 356 | // our entity tree is going to go away so tell that to the EntityScriptingInterface |
| 355 | 357 | DependencyManager::get<EntityScriptingInterface>()->setEntityTree(nullptr); |
| 356 | 358 | |