Closing the open tablet dialog - try harder

interface/resources/qml/hifi/tablet/TabletRoot.qml

@@ -65,6 +65,18 @@ Item {
         return false;
     }
 
+    function closeDialog() {
+        if (openMessage != null) {
+            openMessage.destroy();
+            openMessage = null;
+        }
+
+        if (openModal != null) {
+            openModal.destroy();
+            openModal = null;
+        }
+    }
+
     function isUrlLoaded(url) {
         if (currentApp >= 0) {
             var currentAppUrl = tabletApps.get(currentApp).appUrl;

interface/src/ui/DialogsManager.cpp

@@ -97,7 +97,8 @@ void DialogsManager::setDomainConnectionFailureVisibility(bool visible) {
             if (!hmd->getShouldShowTablet()) {
                 hmd->openTablet();
             }
-        } else {
+        } else if (tablet->isPathLoaded(url)) {
+            tablet->closeDialog();
             tablet->gotoHomeScreen();
             hmd->closeTablet();
         }

libraries/ui/src/ui/TabletScriptingInterface.cpp

@@ -431,6 +431,20 @@ bool TabletProxy::isMessageDialogOpen() {
     return result.toBool();
 }
 
+void TabletProxy::closeDialog() {
+    if (QThread::currentThread() != thread()) {
+        bool result = false;
+        QMetaObject::invokeMethod(this, "isMessageDialogOpen");
+        return;
+    }
+
+    if (!_qmlTabletRoot) {
+        return;
+    }
+
+    QMetaObject::invokeMethod(_qmlTabletRoot, "closeDialog");
+}
+
 void TabletProxy::emitWebEvent(const QVariant& msg) {
     if (QThread::currentThread() != thread()) {
         QMetaObject::invokeMethod(this, "emitWebEvent", Q_ARG(QVariant, msg));

libraries/ui/src/ui/TabletScriptingInterface.h

@@ -308,6 +308,12 @@ public:
      */
     Q_INVOKABLE bool isMessageDialogOpen();
 
+    /**jsdoc
+    * Close any open dialogs.
+    * @function TabletProxy#closeDialog
+    */
+    Q_INVOKABLE void closeDialog();
+
     /**jsdoc
      * Creates a new button, adds it to this and returns it.
      * @function TabletProxy#addButton