From f47f77b1817b76fb1b67910c3f2049010b81beb4 Mon Sep 17 00:00:00 2001 From: David Rowe Date: Wed, 7 Nov 2018 09:11:43 +1300 Subject: [PATCH 1/2] Fix mini tablet JavaScript crash --- scripts/system/miniTablet.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/scripts/system/miniTablet.js b/scripts/system/miniTablet.js index a2f0d074f0..718605543c 100644 --- a/scripts/system/miniTablet.js +++ b/scripts/system/miniTablet.js @@ -1006,7 +1006,8 @@ return; } - if (message.grabbedEntity !== HMD.tabletID && message.grabbedEntity !== ui.getMiniTabletID()) { + if (miniState.getState() === miniState.MINI_DISABLED + || message.grabbedEntity !== HMD.tabletID && message.grabbedEntity !== ui.getMiniTabletID()) { return; } From 629559e78c52f1155523c7a207b29544eec7cb27 Mon Sep 17 00:00:00 2001 From: David Rowe Date: Wed, 7 Nov 2018 09:20:54 +1300 Subject: [PATCH 2/2] Add extra ()s --- scripts/system/miniTablet.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/system/miniTablet.js b/scripts/system/miniTablet.js index 718605543c..9ff58c83fd 100644 --- a/scripts/system/miniTablet.js +++ b/scripts/system/miniTablet.js @@ -1007,7 +1007,7 @@ } if (miniState.getState() === miniState.MINI_DISABLED - || message.grabbedEntity !== HMD.tabletID && message.grabbedEntity !== ui.getMiniTabletID()) { + || (message.grabbedEntity !== HMD.tabletID && message.grabbedEntity !== ui.getMiniTabletID())) { return; }