Mirrors/overte-thingvellir
3
0
Fork 0
mirror of https://thingvellir.net/git/overte synced 2025-03-27 23:52:03 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

fixed double scriptEnding being called

Browse source
This commit is contained in:
milad 2019-09-04 15:51:07 -07:00
parent df3f7fcb72
commit d316f014eb
2 changed files with 6 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
scripts/simplifiedUI/simplifiedEmote/emojiApp/simplifiedEmoji.js
View file

@ -416,7 +416,6 @@ function init() {
Window.domainChanged.connect(onDomainChanged);
MyAvatar.scaleChanged.connect(onScaleChanged);
Script.scriptEnding.connect(scriptEnding);
signalsConnected = true;
}
@ -431,18 +430,6 @@ function init() {
// *************************************
// #region cleanup
function scriptEnding() {
resetEmojis();
if (signalsConnected) {
Script.scriptEnding.disconnect(scriptEnding);
Window.domainChanged.disconnect(onDomainChanged);
MyAvatar.scaleChanged.disconnect(onScaleChanged);
signalsConnected = false;
}
}
// #endregion
// *************************************
// END cleanup
@ -476,7 +463,12 @@ function addEmojiFromQML(code) {
}
function unload() {
scriptEnding();
resetEmojis();
if (signalsConnected) {
Window.domainChanged.disconnect(onDomainChanged);
MyAvatar.scaleChanged.disconnect(onScaleChanged);
signalsConnected = false;
}
}
function startup() {

1
scripts/simplifiedUI/simplifiedEmote/simplifiedEmote.js
View file

@ -587,7 +587,6 @@ function init() {
Controller.keyReleaseEvent.connect(keyReleaseHandler);
keyPressSignalsConnected = true;
Script.scriptEnding.connect(shutdown);
}