From 105457b388b2c065733aa21a52b9fe62e440c69a Mon Sep 17 00:00:00 2001 From: David Rowe Date: Fri, 6 Oct 2017 13:27:08 +1300 Subject: [PATCH] Don't unbusubscribe from possibly shared channel --- scripts/shapes/shapes.js | 4 ++-- scripts/system/edit.js | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/scripts/shapes/shapes.js b/scripts/shapes/shapes.js index 4686a48470..290424f55e 100644 --- a/scripts/shapes/shapes.js +++ b/scripts/shapes/shapes.js @@ -1988,8 +1988,8 @@ Entities.canRezChanged.disconnect(onCanRezChanged); Entities.canRezTmpChanged.disconnect(onCanRezChanged); Messages.messageReceived.disconnect(onMessageReceived); - // Messages.unsubscribe(DOMAIN_CHANGED_MESSAGE); Do NOT unsubscribe because edit.js also subscribes and - // Messages.subscribe works client-wide. + // Messages.unsubscribe(DOMAIN_CHANGED_MESSAGE); Do not unsubscribe because edit.js also subscribes and + // Messages.subscribe works script engine-wide which would mess things up if they're both run in the same engine. MyAvatar.dominantHandChanged.disconnect(onDominantHandChanged); MyAvatar.skeletonChanged.disconnect(onSkeletonChanged); diff --git a/scripts/system/edit.js b/scripts/system/edit.js index 9f15abaa1f..d6d4de2a4b 100644 --- a/scripts/system/edit.js +++ b/scripts/system/edit.js @@ -1234,7 +1234,8 @@ Script.scriptEnding.connect(function () { Messages.messageReceived.disconnect(handleMessagesReceived); Messages.unsubscribe("entityToolUpdates"); - Messages.unsubscribe("Toolbar-DomainChanged"); + // Messages.unsubscribe("Toolbar-DomainChanged"); // Do not unsubscribe because the shapes.js app also subscribes and + // Messages.subscribe works script engine-wide which would mess things up if they're both run in the same engine. createButton = null; });