fixed double scriptEnding being called

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

View file

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

View file

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