Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-07-10 21:58:42 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Only take down tablet if it was brought up

Browse source
This commit is contained in:
Simon Walton 2018-06-01 10:41:08 -07:00
parent 2d9a5c62c1
commit f58e1ebdd9
2 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
interface/src/ui/DialogsManager.cpp
View file

@ -93,6 +93,7 @@ void DialogsManager::setDomainConnectionFailureVisibility(bool visible) {
static const QUrl url("dialogs/TabletConnectionFailureDialog.qml"); static const QUrl url("dialogs/TabletConnectionFailureDialog.qml");
auto hmd = DependencyManager::get<HMDScriptingInterface>(); auto hmd = DependencyManager::get<HMDScriptingInterface>();
if (visible) { if (visible) {
_dialogCreatedWhileShown = tablet->property("tabletShown").toBool();
tablet->initialScreen(url); tablet->initialScreen(url);
if (!hmd->getShouldShowTablet()) { if (!hmd->getShouldShowTablet()) {
hmd->openTablet(); hmd->openTablet();
@ -100,7 +101,10 @@ void DialogsManager::setDomainConnectionFailureVisibility(bool visible) {
} else if (tablet->isPathLoaded(url)) { } else if (tablet->isPathLoaded(url)) {
tablet->closeDialog(); tablet->closeDialog();
tablet->gotoHomeScreen(); tablet->gotoHomeScreen();
hmd->closeTablet(); if (!_dialogCreatedWhileShown) {
hmd->closeTablet();
}
_dialogCreatedWhileShown = false;
} }
} }
} }

1
interface/src/ui/DialogsManager.h
View file

@ -80,6 +80,7 @@ private:
QPointer<OctreeStatsDialog> _octreeStatsDialog; QPointer<OctreeStatsDialog> _octreeStatsDialog;
QPointer<TestingDialog> _testingDialog; QPointer<TestingDialog> _testingDialog;
QPointer<DomainConnectionDialog> _domainConnectionDialog; QPointer<DomainConnectionDialog> _domainConnectionDialog;
bool _dialogCreatedWhileShown { false };
bool _addressBarVisible { false }; bool _addressBarVisible { false };
}; };