From 229e73f88c4444bf3f8d9812ceb061192ea96477 Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Wed, 16 Sep 2015 11:52:05 -0700
Subject: [PATCH] protect the agent from null timers in avatar stop

---
 assignment-client/src/Agent.cpp | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/assignment-client/src/Agent.cpp b/assignment-client/src/Agent.cpp
index 58d8c931f8..157154606f 100644
--- a/assignment-client/src/Agent.cpp
+++ b/assignment-client/src/Agent.cpp
@@ -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;
+        }
     }
 }