protect the agent from null timers in avatar stop

This commit is contained in:
Stephen Birarda 2015-09-16 11:52:05 -07:00
parent bca00db4a8
commit 229e73f88c

View file

@ -226,10 +226,17 @@ void Agent::setIsAvatar(bool isAvatar) {
}
if (!_isAvatar) {
delete _avatarIdentityTimer;
_avatarIdentityTimer = NULL;
delete _avatarBillboardTimer;
_avatarBillboardTimer = NULL;
if (_avatarIdentityTimer) {
_avatarIdentityTimer->stop();
delete _avatarIdentityTimer;
_avatarIdentityTimer = nullptr;
}
if (_avatarBillboardTimer) {
_avatarIdentityTimer->stop();
delete _avatarIdentityTimer;
_avatarBillboardTimer = nullptr;
}
}
}