Merge pull request #14357 from ctrlaltdavid/M19761

Fix mini tablet JavaScript crash
This commit is contained in:
Brad Hefta-Gaub 2018-11-13 12:15:56 -08:00 committed by GitHub
commit 07f94030ce
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -1007,7 +1007,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;
}