From c6d0c0909e03b70cb434a61b1394edbb998baf0b Mon Sep 17 00:00:00 2001
From: Seth Alves <seth@highfidelity.io>
Date: Wed, 18 Jan 2017 14:54:38 -0800
Subject: [PATCH] avoid unthreadsafe use of getJointIndex

---
 interface/src/avatar/Avatar.cpp | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/interface/src/avatar/Avatar.cpp b/interface/src/avatar/Avatar.cpp
index ff9ad8597c..04e9920a0a 100644
--- a/interface/src/avatar/Avatar.cpp
+++ b/interface/src/avatar/Avatar.cpp
@@ -929,7 +929,12 @@ glm::quat Avatar::getAbsoluteJointRotationInObjectFrame(int index) const {
         }
         case CAMERA_MATRIX_INDEX: {
             glm::quat rotation;
-            _skeletonModel->getAbsoluteJointRotationInRigFrame(getJointIndex("head"), rotation);
+            if (_skeletonModel) {
+                int headJointIndex = _skeletonModel->getFBXGeometry().headJointIndex;
+                if (headJointIndex >= 0) {
+                    _skeletonModel->getAbsoluteJointRotationInRigFrame(headJointIndex, rotation);
+                }
+            }
             return rotation;
         }
         default: {
@@ -960,7 +965,12 @@ glm::vec3 Avatar::getAbsoluteJointTranslationInObjectFrame(int index) const {
         }
         case CAMERA_MATRIX_INDEX: {
             glm::vec3 translation;
-            _skeletonModel->getAbsoluteJointTranslationInRigFrame(getJointIndex("head"), translation);
+            if (_skeletonModel) {
+                int headJointIndex = _skeletonModel->getFBXGeometry().headJointIndex;
+                if (headJointIndex >= 0) {
+                    _skeletonModel->getAbsoluteJointTranslationInRigFrame(headJointIndex, translation);
+                }
+            }
             return translation;
         }
         default: {