From 06a69c8bd72ca1f01cc3e60303530249ae590e34 Mon Sep 17 00:00:00 2001
From: Dante Ruiz <dante@highfidelity.io>
Date: Tue, 18 Jul 2017 20:27:55 +0100
Subject: [PATCH 1/2] fixed another tablet stuck on help screen

---
 libraries/ui/src/ui/TabletScriptingInterface.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/libraries/ui/src/ui/TabletScriptingInterface.cpp b/libraries/ui/src/ui/TabletScriptingInterface.cpp
index 76f290f17e..496095de79 100644
--- a/libraries/ui/src/ui/TabletScriptingInterface.cpp
+++ b/libraries/ui/src/ui/TabletScriptingInterface.cpp
@@ -226,9 +226,12 @@ void TabletProxy::setToolbarMode(bool toolbarMode) {
 
         // forward qml surface events to interface js
         connect(tabletRootWindow, &QmlWindowClass::fromQml, this, &TabletProxy::fromQml);
+        loadHomeScreen(true);
+        emit screenChanged(QVariant("Home"), QVariant(TABLET_SOURCE_URL));
     } else {
         removeButtonsFromToolbar();
         addButtonsToHomeScreen();
+        loadHomeScreen(true);
         emit screenChanged(QVariant("Home"), QVariant(TABLET_SOURCE_URL));
 
         // destroy desktop window

From fdfeab77eb919568a5d3444c6aea6b76235dc8ec Mon Sep 17 00:00:00 2001
From: Dante Ruiz <dante@highfidelity.io>
Date: Wed, 19 Jul 2017 16:28:16 +0100
Subject: [PATCH 2/2] made requested changes

---
 libraries/ui/src/ui/TabletScriptingInterface.cpp | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/libraries/ui/src/ui/TabletScriptingInterface.cpp b/libraries/ui/src/ui/TabletScriptingInterface.cpp
index 496095de79..6ff5e46cea 100644
--- a/libraries/ui/src/ui/TabletScriptingInterface.cpp
+++ b/libraries/ui/src/ui/TabletScriptingInterface.cpp
@@ -226,13 +226,9 @@ void TabletProxy::setToolbarMode(bool toolbarMode) {
 
         // forward qml surface events to interface js
         connect(tabletRootWindow, &QmlWindowClass::fromQml, this, &TabletProxy::fromQml);
-        loadHomeScreen(true);
-        emit screenChanged(QVariant("Home"), QVariant(TABLET_SOURCE_URL));
     } else {
         removeButtonsFromToolbar();
         addButtonsToHomeScreen();
-        loadHomeScreen(true);
-        emit screenChanged(QVariant("Home"), QVariant(TABLET_SOURCE_URL));
 
         // destroy desktop window
         if (_desktopWindow) {
@@ -240,6 +236,8 @@ void TabletProxy::setToolbarMode(bool toolbarMode) {
             _desktopWindow = nullptr;
         }
     }
+    loadHomeScreen(true);
+    emit screenChanged(QVariant("Home"), QVariant(TABLET_SOURCE_URL));
 }
 
 static void addButtonProxyToQmlTablet(QQuickItem* qmlTablet, TabletButtonProxy* buttonProxy) {