From 1781abe9375bee5f465132f8cb957285a27b511a Mon Sep 17 00:00:00 2001 From: atlante45 Date: Wed, 4 Sep 2013 10:40:42 -0700 Subject: [PATCH] Added Menu instance deletion in Application destructor. --- interface/src/Application.cpp | 2 ++ interface/src/Menu.cpp | 1 - interface/src/Menu.h | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp index 5fbf6f928e..e80665b0f7 100644 --- a/interface/src/Application.cpp +++ b/interface/src/Application.cpp @@ -238,6 +238,8 @@ Application::~Application() { NodeList::getInstance()->removeHook(&_voxels); NodeList::getInstance()->removeHook(this); + delete Menu::getInstance(); + delete _oculusProgram; delete _settings; delete _networkAccessManager; diff --git a/interface/src/Menu.cpp b/interface/src/Menu.cpp index dc288fd73b..1fcc5a6274 100644 --- a/interface/src/Menu.cpp +++ b/interface/src/Menu.cpp @@ -414,7 +414,6 @@ Menu::Menu() : } Menu::~Menu() { - qDebug("[DEBUG] Menu destructor.\n]"); bandwidthDetailsClosed(); voxelStatsDetailsClosed(); delete _voxelModeActionsGroup; diff --git a/interface/src/Menu.h b/interface/src/Menu.h index e207ffe32d..676d8aefba 100644 --- a/interface/src/Menu.h +++ b/interface/src/Menu.h @@ -38,6 +38,7 @@ class Menu : public QMenuBar { Q_OBJECT public: static Menu* getInstance(); + ~Menu(); bool isOptionChecked(const QString& menuOption); void triggerOption(const QString& menuOption); @@ -79,7 +80,6 @@ private: static Menu* _instance; Menu(); - ~Menu(); typedef void(*settingsAction)(QSettings*, QAction*); static void loadAction(QSettings* set, QAction* action);