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

Merge pull request #16231 from danteruiz/fix-2.0

Browse source 
BUGZ-1522: Snap app on tablet is blocked when saving/canceling out of its Settings page
This commit is contained in:
Shannon Romano 2019-09-23 09:20:42 -07:00 committed by GitHub
commit db0feb4f52
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
interface/resources/qml/hifi/tablet/tabletWindows/TabletPreferencesDialog.qml
View file

@ -43,7 +43,9 @@ Item {
}
if (HMD.active) {
if (gotoPreviousApp) {
if (gotoPreviousAppFromScript) {
dialog.parent.sendToScript("returnToPreviousApp");
} else if (gotoPreviousApp) {
tablet.returnToPreviousApp();
} else {
tablet.popFromStack();
@ -60,7 +62,9 @@ Item {
}
if (HMD.active) {
if (gotoPreviousApp) {
if (gotoPreviousAppFromScript) {
dialog.parent.sendToScript("returnToPreviousApp");
} else if (gotoPreviousApp) {
tablet.returnToPreviousApp();
} else {
tablet.popFromStack();