From 4eb5c9714bd6c94747324859911a5dfa1ed77e2f Mon Sep 17 00:00:00 2001
From: Dante Ruiz <danteruiz102@gmail.com>
Date: Fri, 14 Sep 2018 12:59:28 -0700
Subject: [PATCH 1/2] fix snapshot settings

---
 .../tablet/tabletWindows/TabletPreferencesDialog.qml | 12 ++----------
 interface/src/Menu.cpp                               |  2 +-
 2 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/interface/resources/qml/hifi/tablet/tabletWindows/TabletPreferencesDialog.qml b/interface/resources/qml/hifi/tablet/tabletWindows/TabletPreferencesDialog.qml
index 5a0dc24dbc..05f45dc61e 100644
--- a/interface/resources/qml/hifi/tablet/tabletWindows/TabletPreferencesDialog.qml
+++ b/interface/resources/qml/hifi/tablet/tabletWindows/TabletPreferencesDialog.qml
@@ -41,11 +41,7 @@ Item {
             section.saveAll();
         }
 
-        if (HMD.active) {
-            tablet.popFromStack();
-        } else {
-            closeDialog();
-        }
+        closeDialog();
     }
 
     function restoreAll() {
@@ -54,11 +50,7 @@ Item {
             section.restoreAll();
         }
 
-        if (HMD.active) {
-            tablet.popFromStack();
-        } else {
-            closeDialog();
-        }
+        closeDialog();
     }
 
     function closeDialog() {
diff --git a/interface/src/Menu.cpp b/interface/src/Menu.cpp
index 7a310e675f..bffc9519bf 100644
--- a/interface/src/Menu.cpp
+++ b/interface/src/Menu.cpp
@@ -255,7 +255,7 @@ Menu::Menu() {
     connect(action, &QAction::triggered, [] {
             auto tablet = DependencyManager::get<TabletScriptingInterface>()->getTablet("com.highfidelity.interface.tablet.system");
             auto hmd = DependencyManager::get<HMDScriptingInterface>();
-            tablet->pushOntoStack("hifi/tablet/ControllerSettings.qml");
+            tablet->loadQMLOnTop("hifi/tablet/ControllerSettings.qml");
 
             if (!hmd->getShouldShowTablet()) {
                 hmd->toggleShouldShowTablet();

From ff52639bc3b25c3b5e1ff7b9e0d9e59cf1025504 Mon Sep 17 00:00:00 2001
From: Dante Ruiz <danteruiz102@gmail.com>
Date: Fri, 14 Sep 2018 14:10:36 -0700
Subject: [PATCH 2/2] fix update

---
 .../tabletWindows/TabletPreferencesDialog.qml | 20 +++++++++++++++++--
 interface/src/Menu.cpp                        |  2 +-
 2 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/interface/resources/qml/hifi/tablet/tabletWindows/TabletPreferencesDialog.qml b/interface/resources/qml/hifi/tablet/tabletWindows/TabletPreferencesDialog.qml
index 05f45dc61e..ec2c003383 100644
--- a/interface/resources/qml/hifi/tablet/tabletWindows/TabletPreferencesDialog.qml
+++ b/interface/resources/qml/hifi/tablet/tabletWindows/TabletPreferencesDialog.qml
@@ -41,7 +41,15 @@ Item {
             section.saveAll();
         }
 
-        closeDialog();
+        if (HMD.active) {
+            if (gotoPreviousApp) {
+                tablet.returnToPreviousApp();
+            } else {
+                tablet.popFromStack();
+            }
+        } else {
+            closeDialog();
+        }
     }
 
     function restoreAll() {
@@ -50,7 +58,15 @@ Item {
             section.restoreAll();
         }
 
-        closeDialog();
+        if (HMD.active) {
+            if (gotoPreviousApp) {
+                tablet.returnToPreviousApp();
+            } else {
+                tablet.popFromStack();
+            }
+        } else {
+            closeDialog();
+        }
     }
 
     function closeDialog() {
diff --git a/interface/src/Menu.cpp b/interface/src/Menu.cpp
index bffc9519bf..7a310e675f 100644
--- a/interface/src/Menu.cpp
+++ b/interface/src/Menu.cpp
@@ -255,7 +255,7 @@ Menu::Menu() {
     connect(action, &QAction::triggered, [] {
             auto tablet = DependencyManager::get<TabletScriptingInterface>()->getTablet("com.highfidelity.interface.tablet.system");
             auto hmd = DependencyManager::get<HMDScriptingInterface>();
-            tablet->loadQMLOnTop("hifi/tablet/ControllerSettings.qml");
+            tablet->pushOntoStack("hifi/tablet/ControllerSettings.qml");
 
             if (!hmd->getShouldShowTablet()) {
                 hmd->toggleShouldShowTablet();