From 941050d42c81036581d99ae5fc528a0c682e4375 Mon Sep 17 00:00:00 2001
From: Wayne Chen <wayne@highfidelity.io>
Date: Wed, 12 Dec 2018 12:43:01 -0800
Subject: [PATCH] fixing tablet apps/referenceerror

---
 interface/resources/qml/dialogs/TabletLoginDialog.qml | 5 ++++-
 interface/src/ui/overlays/Web3DOverlay.cpp            | 3 ++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/interface/resources/qml/dialogs/TabletLoginDialog.qml b/interface/resources/qml/dialogs/TabletLoginDialog.qml
index f57499d66c..659bf395f9 100644
--- a/interface/resources/qml/dialogs/TabletLoginDialog.qml
+++ b/interface/resources/qml/dialogs/TabletLoginDialog.qml
@@ -26,6 +26,8 @@ FocusScope {
     height: parent.height
 
     signal sendToScript(var message);
+    signal canceled();
+
     property bool isHMD: false
     property bool gotoPreviousApp: false;
 
@@ -50,7 +52,8 @@ FocusScope {
     }
 
     function tryDestroy() {
-        canceled()
+        canceled();
+        root.destroy();
     }
 
     MouseArea {
diff --git a/interface/src/ui/overlays/Web3DOverlay.cpp b/interface/src/ui/overlays/Web3DOverlay.cpp
index 78153a7a9d..a36a5481c2 100644
--- a/interface/src/ui/overlays/Web3DOverlay.cpp
+++ b/interface/src/ui/overlays/Web3DOverlay.cpp
@@ -238,7 +238,8 @@ void Web3DOverlay::setupQmlSurface(bool isTablet, bool isLoginDialog) {
 
     if (isTablet || isLoginDialog) {
         _webSurface->getSurfaceContext()->setContextProperty("Account", AccountServicesScriptingInterface::getInstance()); // DEPRECATED - TO BE REMOVED
-    } else if (isTablet) {
+    }
+    if (isTablet) {
         auto tabletScriptingInterface = DependencyManager::get<TabletScriptingInterface>();
         auto flags = tabletScriptingInterface->getFlags();