From 956e70e415471bd58c4e55364ff907cda8118da4 Mon Sep 17 00:00:00 2001 From: David Rowe Date: Tue, 26 Jan 2016 22:07:05 +1300 Subject: [PATCH] Make entity properties return undefined value after entity is deleted --- libraries/entities/src/EntityItemProperties.cpp | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/libraries/entities/src/EntityItemProperties.cpp b/libraries/entities/src/EntityItemProperties.cpp index 0ccd6a74bd..0a72789485 100644 --- a/libraries/entities/src/EntityItemProperties.cpp +++ b/libraries/entities/src/EntityItemProperties.cpp @@ -321,6 +321,11 @@ QScriptValue EntityItemProperties::copyToScriptValue(QScriptEngine* engine, bool QScriptValue properties = engine->newObject(); EntityItemProperties defaultEntityProperties; + if (_created == UNKNOWN_CREATED_TIME) { + // No entity properties can have been set so return without setting any default, zero property values. + return properties; + } + if (_idSet) { COPY_PROPERTY_TO_QSCRIPTVALUE_GETTER_ALWAYS(id, _id.toString()); }