Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-04-13 21:08:00 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #10174 from vladest/fix-snapshot-login-cancel

Browse source 
Check if dialog was opened from StackView and then pop or just go to …
This commit is contained in:
Seth Alves 2017-04-11 07:07:29 -07:00 committed by GitHub
commit d5f5192954
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
interface/resources/qml/dialogs/TabletLoginDialog.qml
View file

@ -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 {