From ced1b61b70d7aac3191d55cff30860d696e47dd5 Mon Sep 17 00:00:00 2001 From: Seth Alves Date: Tue, 24 Jan 2017 16:03:22 -0800 Subject: [PATCH] close rather than attempt to repair the tablet after a domain change --- scripts/system/tablet-ui/tabletUI.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/scripts/system/tablet-ui/tabletUI.js b/scripts/system/tablet-ui/tabletUI.js index 5db29b2738..7011aa4cab 100644 --- a/scripts/system/tablet-ui/tabletUI.js +++ b/scripts/system/tablet-ui/tabletUI.js @@ -56,9 +56,10 @@ if (tabletShown && UIWebTablet && Overlays.getOverlayType(UIWebTablet.webOverlayID) != "web3d") { // when we switch domains, the tablet entity gets destroyed and recreated. this causes - // the overlay to be deleted, but not recreated. repair this situation here: + // the overlay to be deleted, but not recreated. If the overlay is deleted for this or any + // other reason, close the tablet. hideTabletUI(); - showTabletUI(); + HMD.closeTablet(); } else if (HMD.showTablet && !tabletShown) { showTabletUI(); } else if (!HMD.showTablet && tabletShown) {