From 62b4eac875fa5e76487965ab828e32dec02dfb61 Mon Sep 17 00:00:00 2001
From: Seth Alves <seth.alves@gmail.com>
Date: Fri, 4 Dec 2015 16:41:56 -0800
Subject: [PATCH] fix avatar-mixer parents-related crash

---
 assignment-client/src/avatars/AvatarMixerClientData.cpp | 8 ++++----
 assignment-client/src/avatars/AvatarMixerClientData.h   | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/assignment-client/src/avatars/AvatarMixerClientData.cpp b/assignment-client/src/avatars/AvatarMixerClientData.cpp
index 9d78d92463..96df98fdd0 100644
--- a/assignment-client/src/avatars/AvatarMixerClientData.cpp
+++ b/assignment-client/src/avatars/AvatarMixerClientData.cpp
@@ -18,7 +18,7 @@ int AvatarMixerClientData::parseData(NLPacket& packet) {
     packet.readPrimitive(&_lastReceivedSequenceNumber);
 
     // compute the offset to the data payload
-    return _avatar.parseDataFromBuffer(packet.readWithoutCopy(packet.bytesLeftToRead()));
+    return _avatar->parseDataFromBuffer(packet.readWithoutCopy(packet.bytesLeftToRead()));
 }
 
 bool AvatarMixerClientData::checkAndSetHasReceivedFirstPacketsFrom(const QUuid& uuid) {
@@ -40,7 +40,7 @@ uint16_t AvatarMixerClientData::getLastBroadcastSequenceNumber(const QUuid& node
 }
 
 void AvatarMixerClientData::loadJSONStats(QJsonObject& jsonObject) const {
-    jsonObject["display_name"] = _avatar.getDisplayName();
+    jsonObject["display_name"] = _avatar->getDisplayName();
     jsonObject["full_rate_distance"] = _fullRateDistance;
     jsonObject["max_av_distance"] = _maxAvatarDistance;
     jsonObject["num_avs_sent_last_frame"] = _numAvatarsSentLastFrame;
@@ -49,7 +49,7 @@ void AvatarMixerClientData::loadJSONStats(QJsonObject& jsonObject) const {
     jsonObject["total_num_out_of_order_sends"] = _numOutOfOrderSends;
 
     jsonObject[OUTBOUND_AVATAR_DATA_STATS_KEY] = getOutboundAvatarDataKbps();
-    jsonObject[INBOUND_AVATAR_DATA_STATS_KEY] = _avatar.getAverageBytesReceivedPerSecond() / (float) BYTES_PER_KILOBIT;
+    jsonObject[INBOUND_AVATAR_DATA_STATS_KEY] = _avatar->getAverageBytesReceivedPerSecond() / (float) BYTES_PER_KILOBIT;
 
-    jsonObject["av_data_receive_rate"] = _avatar.getReceiveRate();
+    jsonObject["av_data_receive_rate"] = _avatar->getReceiveRate();
 }
diff --git a/assignment-client/src/avatars/AvatarMixerClientData.h b/assignment-client/src/avatars/AvatarMixerClientData.h
index 1f5e8fa77a..09100010e0 100644
--- a/assignment-client/src/avatars/AvatarMixerClientData.h
+++ b/assignment-client/src/avatars/AvatarMixerClientData.h
@@ -34,7 +34,7 @@ class AvatarMixerClientData : public NodeData {
     Q_OBJECT
 public:
     int parseData(NLPacket& packet);
-    AvatarData& getAvatar() { return _avatar; }
+    AvatarData& getAvatar() { return *_avatar; }
 
     bool checkAndSetHasReceivedFirstPacketsFrom(const QUuid& uuid);
 
@@ -80,7 +80,7 @@ public:
 
     void loadJSONStats(QJsonObject& jsonObject) const;
 private:
-    AvatarData _avatar;
+    AvatarSharedPointer _avatar { new AvatarData() };
 
     uint16_t _lastReceivedSequenceNumber { 0 };
     std::unordered_map<QUuid, uint16_t> _lastBroadcastSequenceNumbers;