Merge pull request #24 from birarda/entity-script-server

fix for segfault on entity-script-server forced stop
This commit is contained in:
Clément Brisset 2017-01-20 11:11:42 -08:00 committed by GitHub
commit ba813025d2

View file

@ -296,7 +296,7 @@ void EntityScriptServer::checkAndCallPreload(const EntityItemID& entityID, const
}
void EntityScriptServer::nodeKilled(SharedNodePointer killedNode) {
if (killedNode->getType() == NodeType::EntityServer) {
if (!_shuttingDown && killedNode->getType() == NodeType::EntityServer) {
if (_entitiesScriptEngine) {
_entitiesScriptEngine->unloadAllEntityScripts();
_entitiesScriptEngine->stop();