From 67fb8af87cf6db67f36153bbc50ad86d2d79d6a2 Mon Sep 17 00:00:00 2001
From: Alexander Ivash <elderorb@gmail.com>
Date: Tue, 3 Jul 2018 20:58:48 +0300
Subject: [PATCH] update avatarapp on avatar switch

---
 interface/resources/qml/hifi/avatarapp/AvatarsModel.qml | 1 +
 scripts/system/avatarapp.js                             | 8 ++++++++
 2 files changed, 9 insertions(+)

diff --git a/interface/resources/qml/hifi/avatarapp/AvatarsModel.qml b/interface/resources/qml/hifi/avatarapp/AvatarsModel.qml
index 58913b2b00..3ae1baa0a5 100644
--- a/interface/resources/qml/hifi/avatarapp/AvatarsModel.qml
+++ b/interface/resources/qml/hifi/avatarapp/AvatarsModel.qml
@@ -57,6 +57,7 @@ ListModel {
     }
 
     function populate(bookmarks) {
+        clear();
         for(var avatarName in bookmarks) {
             var avatar = bookmarks[avatarName];
             var avatarEntry = makeAvatarObject(avatar, avatarName);
diff --git a/scripts/system/avatarapp.js b/scripts/system/avatarapp.js
index 0ebffc547e..ad454a4b62 100644
--- a/scripts/system/avatarapp.js
+++ b/scripts/system/avatarapp.js
@@ -102,6 +102,12 @@ function onTargetScaleChanged() {
     }
 }
 
+function onSkeletonModelURLChanged() {
+    if(currentAvatar || (currentAvatar.skeletonModelURL !== MyAvatar.skeletonModelURL)) {
+        fromQml({'method' : 'getAvatars'});
+    }
+}
+
 function onDominantHandChanged(dominantHand) {
     if(currentAvatarSettings.dominantHand !== dominantHand) {
         currentAvatarSettings.dominantHand = dominantHand;
@@ -433,6 +439,7 @@ function off() {
     AvatarBookmarks.bookmarkDeleted.disconnect(onBookmarkDeleted);
     AvatarBookmarks.bookmarkAdded.disconnect(onBookmarkAdded);
 
+    MyAvatar.skeletonModelURLChanged.disconnect(onSkeletonModelURLChanged);
     MyAvatar.dominantHandChanged.disconnect(onDominantHandChanged);
     MyAvatar.collisionsEnabledChanged.disconnect(onCollisionsEnabledChanged);
     MyAvatar.newCollisionSoundURL.disconnect(onNewCollisionSoundUrl);
@@ -445,6 +452,7 @@ function on() {
     AvatarBookmarks.bookmarkDeleted.connect(onBookmarkDeleted);
     AvatarBookmarks.bookmarkAdded.connect(onBookmarkAdded);
 
+    MyAvatar.skeletonModelURLChanged.connect(onSkeletonModelURLChanged);
     MyAvatar.dominantHandChanged.connect(onDominantHandChanged);
     MyAvatar.collisionsEnabledChanged.connect(onCollisionsEnabledChanged);
     MyAvatar.newCollisionSoundURL.connect(onNewCollisionSoundUrl);