From a3f807664118b34b0e0f499490c8b219b21eeadd Mon Sep 17 00:00:00 2001
From: Atlante45 <clement.brisset@gmail.com>
Date: Mon, 6 Apr 2015 17:55:48 +0200
Subject: [PATCH] Quit VRMode before aboutToQuit runs

---
 interface/src/Application.cpp       | 3 ++-
 interface/src/Application.h         | 2 ++
 interface/src/ui/HMDToolsDialog.cpp | 2 +-
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp
index 4e40f2d928..fc40bf8b1e 100644
--- a/interface/src/Application.cpp
+++ b/interface/src/Application.cpp
@@ -564,8 +564,9 @@ Application::Application(int& argc, char** argv, QElapsedTimer &startup_time) :
 }
 
 void Application::aboutToQuit() {
-    _aboutToQuit = true;
+    emit beforeAboutToQuit();
     
+    _aboutToQuit = true;
     cleanupBeforeQuit();
 }
 
diff --git a/interface/src/Application.h b/interface/src/Application.h
index e9b8deff55..cf047f02d4 100644
--- a/interface/src/Application.h
+++ b/interface/src/Application.h
@@ -337,6 +337,8 @@ signals:
 
     void faceURLChanged(const QString& newValue);
     void skeletonURLChanged(const QString& newValue);
+    
+    void beforeAboutToQuit();
 
 public slots:
     void domainChanged(const QString& domainHostname);
diff --git a/interface/src/ui/HMDToolsDialog.cpp b/interface/src/ui/HMDToolsDialog.cpp
index 6c88bf9263..d7aacae86c 100644
--- a/interface/src/ui/HMDToolsDialog.cpp
+++ b/interface/src/ui/HMDToolsDialog.cpp
@@ -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);