Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-19 15:43:50 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #4599 from Atlante45/fix_quit_vrmode_on_close

Browse source 
Quit VRMode before aboutToQuit runs
This commit is contained in:
Brad Davis 2015-04-07 17:06:29 -07:00
commit 9b34003e2d
3 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
interface/src/Application.cpp
View file

@ -565,8 +565,9 @@ Application::Application(int& argc, char** argv, QElapsedTimer &startup_time) :
}
void Application::aboutToQuit() {
_aboutToQuit = true;
emit beforeAboutToQuit();
_aboutToQuit = true;
cleanupBeforeQuit();
}

2
interface/src/Application.h
View file

@ -337,6 +337,8 @@ signals:
void faceURLChanged(const QString& newValue);
void skeletonURLChanged(const QString& newValue);
void beforeAboutToQuit();
public slots:
void domainChanged(const QString& domainHostname);

2
interface/src/ui/HMDToolsDialog.cpp
View file

@ -87,7 +87,7 @@ HMDToolsDialog::HMDToolsDialog(QWidget* parent) :
}
// when the application is about to quit, leave HDM mode
connect(Application::getInstance(), SIGNAL(aboutToQuit()), this, SLOT(aboutToQuit()));
connect(Application::getInstance(), SIGNAL(beforeAboutToQuit()), this, SLOT(aboutToQuit()));
// keep track of changes to the number of screens
connect(QApplication::desktop(), &QDesktopWidget::screenCountChanged, this, &HMDToolsDialog::screenCountChanged);