From 74655bde49b878f81e2707af08b871702911ff7a Mon Sep 17 00:00:00 2001 From: Zach Fox Date: Wed, 21 Feb 2018 12:12:20 -0800 Subject: [PATCH] Fix skeletonmodelURLchanged signal --- .../qml/hifi/commerce/purchases/PurchasedItem.qml | 9 ++------- interface/src/avatar/MyAvatar.cpp | 2 +- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/interface/resources/qml/hifi/commerce/purchases/PurchasedItem.qml b/interface/resources/qml/hifi/commerce/purchases/PurchasedItem.qml index 5b70fdbde9..cc2bcd69aa 100644 --- a/interface/resources/qml/hifi/commerce/purchases/PurchasedItem.qml +++ b/interface/resources/qml/hifi/commerce/purchases/PurchasedItem.qml @@ -564,6 +564,7 @@ Item { : hifi.buttons.disabledTextColor[control.colorScheme] } RalewayBold { + id: rezIconLabel; anchors.top: rezIcon.bottom; anchors.topMargin: -4; anchors.right: parent.right; @@ -575,13 +576,7 @@ Item { size: 15; verticalAlignment: Text.AlignVCenter horizontalAlignment: Text.AlignHCenter - text: { - if (MyAvatar.skeletonModelURL === root.itemHref) { - "CURRENT"; - } else { - (root.buttonTextNormal)[itemTypesArray.indexOf(root.itemType)]; - } - } + text: MyAvatar.skeletonModelURL === root.itemHref ? "CURRENT" : (root.buttonTextNormal)[itemTypesArray.indexOf(root.itemType)]; } } } diff --git a/interface/src/avatar/MyAvatar.cpp b/interface/src/avatar/MyAvatar.cpp index c25aaeeecd..50753724e8 100755 --- a/interface/src/avatar/MyAvatar.cpp +++ b/interface/src/avatar/MyAvatar.cpp @@ -1479,7 +1479,7 @@ void MyAvatar::setSkeletonModelURL(const QUrl& skeletonModelURL) { }); saveAvatarUrl(); emit skeletonChanged(); - + emit skeletonModelURLChanged(); } void MyAvatar::removeAvatarEntities() {