Mirrors/overte-thingvellir
3
0
Fork 0
mirror of https://thingvellir.net/git/overte synced 2025-03-27 23:52:03 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

don't delete the HMDToolsDialog on hide, keep it around till app exit.

Browse source
This commit is contained in:
ZappoMan 2014-11-26 09:11:26 -08:00
parent ee46c781c4
commit 821cf46ee9
2 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
interface/src/Menu.cpp
View file

@ -659,6 +659,10 @@ Menu::Menu() :
Menu::~Menu() {
bandwidthDetailsClosed();
octreeStatsDetailsClosed();
if (_hmdToolsDialog) {
delete _hmdToolsDialog;
_hmdToolsDialog = NULL;
}
}
void Menu::loadSettings(QSettings* settings) {
@ -1606,8 +1610,8 @@ void Menu::hmdTools(bool showTools) {
if (!_hmdToolsDialog) {
_hmdToolsDialog = new HMDToolsDialog(Application::getInstance()->getGLWidget());
connect(_hmdToolsDialog, SIGNAL(closed()), SLOT(hmdToolsClosed()));
_hmdToolsDialog->show();
}
_hmdToolsDialog->show();
_hmdToolsDialog->raise();
} else {
hmdToolsClosed();
@ -1616,10 +1620,8 @@ void Menu::hmdTools(bool showTools) {
}
void Menu::hmdToolsClosed() {
if (_hmdToolsDialog) {
delete _hmdToolsDialog;
_hmdToolsDialog = NULL;
}
Menu::getInstance()->getActionForOption(MenuOption::HMDTools)->setChecked(false);
_hmdToolsDialog->hide();
}
void Menu::cycleFrustumRenderMode() {

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

@ -123,6 +123,9 @@ void HMDToolsDialog::reject() {
void HMDToolsDialog::closeEvent(QCloseEvent* event) {
this->QDialog::closeEvent(event);
emit closed();
// TODO: consider if we want to prevent closing of this window
//event->ignore();
}