From 7628916db682376b3be21714ffb2d95f185cceb9 Mon Sep 17 00:00:00 2001
From: Vladyslav Stelmakhovskyi <vladyslav.stelmakhovski@volvocars.com>
Date: Sun, 9 Apr 2017 20:09:15 +0200
Subject: [PATCH] Check if dialog was opened from StackView and then pop or
 just go to home menu

---
 interface/resources/qml/dialogs/TabletLoginDialog.qml | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/interface/resources/qml/dialogs/TabletLoginDialog.qml b/interface/resources/qml/dialogs/TabletLoginDialog.qml
index 78e5edebb5..a37f5be595 100644
--- a/interface/resources/qml/dialogs/TabletLoginDialog.qml
+++ b/interface/resources/qml/dialogs/TabletLoginDialog.qml
@@ -66,7 +66,11 @@ TabletModalWindow {
     HifiConstants { id: hifi }
 
     onCanceled: {
-        loginDialogRoot.Stack.view.pop()
+        if (loginDialogRoot.Stack.view !== null) {
+            loginDialogRoot.Stack.view.pop()
+        } else {
+            Tablet.getTablet("com.highfidelity.interface.tablet.system").gotoHomeScreen();
+        }
     }
 
     LoginDialog {