Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-09 02:27:48 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

FB17036 Avatar App causes error on cache reload (CTRL+R)

Browse source
This commit is contained in:
Alexander Ivash 2018-07-25 01:11:26 +03:00
parent b7d12c6b1c
commit 6db46e84ff
1 changed files with 13 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
scripts/system/avatarapp.js
View file

@ -455,10 +455,6 @@ startup();
var isWired = false; var isWired = false;
function off() { function off() {
if (isWired) { // It is not ok to disconnect these twice, hence guard.
isWired = false;
}
if(adjustWearables.opened) { if(adjustWearables.opened) {
adjustWearables.setOpened(false); adjustWearables.setOpened(false);
ensureWearableSelected(null); ensureWearableSelected(null);
@ -468,6 +464,9 @@ function off() {
Messages.unsubscribe('Hifi-Object-Manipulation'); Messages.unsubscribe('Hifi-Object-Manipulation');
} }
if (isWired) { // It is not ok to disconnect these twice, hence guard.
isWired = false;
AvatarBookmarks.bookmarkLoaded.disconnect(onBookmarkLoaded); AvatarBookmarks.bookmarkLoaded.disconnect(onBookmarkLoaded);
AvatarBookmarks.bookmarkDeleted.disconnect(onBookmarkDeleted); AvatarBookmarks.bookmarkDeleted.disconnect(onBookmarkDeleted);
AvatarBookmarks.bookmarkAdded.disconnect(onBookmarkAdded); AvatarBookmarks.bookmarkAdded.disconnect(onBookmarkAdded);
@ -479,6 +478,7 @@ function off() {
MyAvatar.animGraphUrlChanged.disconnect(onAnimGraphUrlChanged); MyAvatar.animGraphUrlChanged.disconnect(onAnimGraphUrlChanged);
MyAvatar.targetScaleChanged.disconnect(onTargetScaleChanged); MyAvatar.targetScaleChanged.disconnect(onTargetScaleChanged);
} }
}
function on() { function on() {
AvatarBookmarks.bookmarkLoaded.connect(onBookmarkLoaded); AvatarBookmarks.bookmarkLoaded.connect(onBookmarkLoaded);