From ff83a8158bee3be1e1cd9b0054dfb0459de472b7 Mon Sep 17 00:00:00 2001 From: Seth Alves Date: Thu, 10 Aug 2017 13:49:48 -0700 Subject: [PATCH 1/2] cancel effects of --replaceAvatarURL when avatar is changed with preference dialog --- interface/src/Application.h | 1 + interface/src/avatar/MyAvatar.cpp | 1 + 2 files changed, 2 insertions(+) diff --git a/interface/src/Application.h b/interface/src/Application.h index f8eb393f9e..cde3bef1ff 100644 --- a/interface/src/Application.h +++ b/interface/src/Application.h @@ -297,6 +297,7 @@ public: QUuid getTabletFrameID() const; // may be an entity or an overlay void setAvatarOverrideUrl(const QUrl& url, bool save); + void clearAvatarOverrideUrl() { _avatarOverrideUrl = QUrl(); _saveAvatarOverrideUrl = false; } QUrl getAvatarOverrideUrl() { return _avatarOverrideUrl; } bool getSaveAvatarOverrideUrl() { return _saveAvatarOverrideUrl; } diff --git a/interface/src/avatar/MyAvatar.cpp b/interface/src/avatar/MyAvatar.cpp index 7f46a9e3bf..d48a1cf189 100755 --- a/interface/src/avatar/MyAvatar.cpp +++ b/interface/src/avatar/MyAvatar.cpp @@ -1382,6 +1382,7 @@ void MyAvatar::useFullAvatarURL(const QUrl& fullAvatarURL, const QString& modelN } if (_fullAvatarURLFromPreferences != fullAvatarURL) { + qApp->clearAvatarOverrideUrl(); _fullAvatarURLFromPreferences = fullAvatarURL; if (modelName.isEmpty()) { QVariantHash fullAvatarFST = FSTReader::downloadMapping(_fullAvatarURLFromPreferences.toString()); From 1d07bc3b4e854d925a67abfb0e93df3f2997aa58 Mon Sep 17 00:00:00 2001 From: Seth Alves Date: Thu, 10 Aug 2017 14:32:52 -0700 Subject: [PATCH 2/2] try, try again --- interface/src/avatar/MyAvatar.cpp | 1 - interface/src/ui/PreferencesDialog.cpp | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/interface/src/avatar/MyAvatar.cpp b/interface/src/avatar/MyAvatar.cpp index d48a1cf189..7f46a9e3bf 100755 --- a/interface/src/avatar/MyAvatar.cpp +++ b/interface/src/avatar/MyAvatar.cpp @@ -1382,7 +1382,6 @@ void MyAvatar::useFullAvatarURL(const QUrl& fullAvatarURL, const QString& modelN } if (_fullAvatarURLFromPreferences != fullAvatarURL) { - qApp->clearAvatarOverrideUrl(); _fullAvatarURLFromPreferences = fullAvatarURL; if (modelName.isEmpty()) { QVariantHash fullAvatarFST = FSTReader::downloadMapping(_fullAvatarURLFromPreferences.toString()); diff --git a/interface/src/ui/PreferencesDialog.cpp b/interface/src/ui/PreferencesDialog.cpp index c9e59ada23..706186685d 100644 --- a/interface/src/ui/PreferencesDialog.cpp +++ b/interface/src/ui/PreferencesDialog.cpp @@ -52,7 +52,7 @@ void setupPreferences() { { auto getter = [=]()->QString { return myAvatar->getFullAvatarURLFromPreferences().toString(); }; - auto setter = [=](const QString& value) { myAvatar->useFullAvatarURL(value, ""); }; + auto setter = [=](const QString& value) { myAvatar->useFullAvatarURL(value, ""); qApp->clearAvatarOverrideUrl(); }; auto preference = new AvatarPreference(AVATAR_BASICS, "Appearance", getter, setter); preferences->addPreference(preference); }