From 1cc95fbf76475495989b5a55ba8246376ceb311f Mon Sep 17 00:00:00 2001
From: Dante Ruiz <danteruiz102@gmail.com>
Date: Tue, 10 Jul 2018 11:05:41 -0700
Subject: [PATCH] better fix

---
 scripts/system/libraries/WebTablet.js | 10 ++++------
 scripts/system/tablet-ui/tabletUI.js  | 11 ++++++++++-
 2 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/scripts/system/libraries/WebTablet.js b/scripts/system/libraries/WebTablet.js
index 1a3b635f80..f83f961438 100644
--- a/scripts/system/libraries/WebTablet.js
+++ b/scripts/system/libraries/WebTablet.js
@@ -82,19 +82,17 @@ function calcSpawnInfo(hand, landscape) {
 }
 
 
-function cleanUpOldMaterialEntities() {
+cleanUpOldMaterialEntities = function() {
     var avatarEntityData = MyAvatar.getAvatarEntityData();
-
     for (var entityID in avatarEntityData) {
         var entityName = Entities.getEntityProperties(entityID, ["name"]).name;
 
-        if (entityName === TABLET_MATERIAL_ENTITY_NAME) {
+        if (entityName === TABLET_MATERIAL_ENTITY_NAME && entityID !== HMD.homeButtonHighlightMaterialID &&
+           entityID !== HMD.homeButtonUnhighlightMaterialID) {
             Entities.deleteEntity(entityID);
         }
     }
-}
-
-cleanUpOldMaterialEntities();
+};
 
 /**
  * WebTablet
diff --git a/scripts/system/tablet-ui/tabletUI.js b/scripts/system/tablet-ui/tabletUI.js
index 29dc457197..bd6a9c69d5 100644
--- a/scripts/system/tablet-ui/tabletUI.js
+++ b/scripts/system/tablet-ui/tabletUI.js
@@ -13,7 +13,7 @@
 //
 
 /* global Script, HMD, WebTablet, UIWebTablet, UserActivityLogger, Settings, Entities, Messages, Tablet, Overlays,
-   MyAvatar, Menu, AvatarInputs, Vec3 */
+   MyAvatar, Menu, AvatarInputs, Vec3, cleanUpOldMaterialEntities */
 
 (function() { // BEGIN LOCAL_SCOPE
     var tabletRezzed = false;
@@ -31,6 +31,14 @@
 
     Script.include("../libraries/WebTablet.js");
 
+    function cleanupMaterialEntities() {
+        if (Window.isPhysicsEnabled()) {
+            cleanUpOldMaterialEntities();
+            return;
+        }
+        Script.setTimeout(cleanupMaterialEntities, 100);
+    }
+
     function checkTablet() {
         if (gTablet === null) {
             gTablet = Tablet.getTablet("com.highfidelity.interface.tablet.system");
@@ -327,4 +335,5 @@
         HMD.homeButtonHighlightMaterialID = null;
         HMD.homeButtonUnhighlightMaterialID = null;
     });
+    Script.setTimeout(cleanupMaterialEntities, 100);
 }()); // END LOCAL_SCOPE