Added Menu instance deletion in Application destructor.

This commit is contained in:
atlante45 2013-09-04 10:40:42 -07:00
parent a1e433e189
commit 1781abe937
3 changed files with 3 additions and 2 deletions

View file

@ -238,6 +238,8 @@ Application::~Application() {
NodeList::getInstance()->removeHook(&_voxels);
NodeList::getInstance()->removeHook(this);
delete Menu::getInstance();
delete _oculusProgram;
delete _settings;
delete _networkAccessManager;

View file

@ -414,7 +414,6 @@ Menu::Menu() :
}
Menu::~Menu() {
qDebug("[DEBUG] Menu destructor.\n]");
bandwidthDetailsClosed();
voxelStatsDetailsClosed();
delete _voxelModeActionsGroup;

View file

@ -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);