From 297993b358749e115f28052bd3bc842deab62206 Mon Sep 17 00:00:00 2001
From: Zach Pomerantz <zmp@umich.edu>
Date: Fri, 26 May 2017 17:09:39 -0400
Subject: [PATCH] report success on tablet->pushOntoStack

---
 libraries/script-engine/src/TabletScriptingInterface.cpp | 4 +++-
 libraries/script-engine/src/TabletScriptingInterface.h   | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/libraries/script-engine/src/TabletScriptingInterface.cpp b/libraries/script-engine/src/TabletScriptingInterface.cpp
index 644f1e6f0c..cd7e00d322 100644
--- a/libraries/script-engine/src/TabletScriptingInterface.cpp
+++ b/libraries/script-engine/src/TabletScriptingInterface.cpp
@@ -439,7 +439,7 @@ void TabletProxy::loadQMLSource(const QVariant& path) {
     }
 }
 
-void TabletProxy::pushOntoStack(const QVariant& path) {
+bool TabletProxy::pushOntoStack(const QVariant& path) {
     QObject* root = nullptr;
     if (!_toolbarMode && _qmlTabletRoot) {
         root = _qmlTabletRoot;
@@ -457,6 +457,8 @@ void TabletProxy::pushOntoStack(const QVariant& path) {
     } else {
         qCDebug(scriptengine) << "tablet cannot push QML because _qmlTabletRoot or _desktopWindow is null";
     }
+
+    return root;
 }
 
 void TabletProxy::popFromStack() {
diff --git a/libraries/script-engine/src/TabletScriptingInterface.h b/libraries/script-engine/src/TabletScriptingInterface.h
index 85c1fdaf9a..5329d6ed9c 100644
--- a/libraries/script-engine/src/TabletScriptingInterface.h
+++ b/libraries/script-engine/src/TabletScriptingInterface.h
@@ -119,7 +119,9 @@ public:
     Q_INVOKABLE void gotoWebScreen(const QString& url, const QString& injectedJavaScriptUrl);
 
     Q_INVOKABLE void loadQMLSource(const QVariant& path);
-    Q_INVOKABLE void pushOntoStack(const QVariant& path);
+    // FIXME: This currently relies on a script initializing the tablet (hence the bool denoting success);
+    //        it should be initialized internally so it cannot fail
+    Q_INVOKABLE bool pushOntoStack(const QVariant& path);
     Q_INVOKABLE void popFromStack();
 
     Q_INVOKABLE void loadQMLOnTop(const QVariant& path);