From 29a159b90d6ba09adfeefbdb8d695ec8c4eeea88 Mon Sep 17 00:00:00 2001 From: "Anthony J. Thibault" Date: Tue, 28 Mar 2017 09:27:13 -0700 Subject: [PATCH] WebTablet.js: Don't remove or add mouse callbacks onHMDChanged This should prevent the exception on destroy, caused by disconnecting a signal that is not attached. --- scripts/system/libraries/WebTablet.js | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/scripts/system/libraries/WebTablet.js b/scripts/system/libraries/WebTablet.js index 0b4186e39b..e2d2791536 100644 --- a/scripts/system/libraries/WebTablet.js +++ b/scripts/system/libraries/WebTablet.js @@ -429,16 +429,6 @@ WebTablet.prototype.calculateTabletAttachmentProperties = function (hand, useMou WebTablet.prototype.onHmdChanged = function () { - if (HMD.active) { - Controller.mousePressEvent.disconnect(this.myMousePressEvent); - Controller.mouseMoveEvent.disconnect(this.myMouseMoveEvent); - Controller.mouseReleaseEvent.disconnect(this.myMouseReleaseEvent); - } else { - Controller.mousePressEvent.connect(this.myMousePressEvent); - Controller.mouseMoveEvent.connect(this.myMouseMoveEvent); - Controller.mouseReleaseEvent.connect(this.myMouseReleaseEvent); - } - var tabletProperties = {}; // compute position, rotation & parentJointIndex of the tablet this.calculateTabletAttachmentProperties(NO_HANDS, false, tabletProperties);