Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-06 16:36:54 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Added Menu instance deletion in Application destructor.

Browse source
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
Show stats Download patch file Download diff file Expand all files Collapse all files

2
interface/src/Application.cpp
View file

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

1
interface/src/Menu.cpp
View file

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

2
interface/src/Menu.h
View file

@ -38,6 +38,7 @@ class Menu : public QMenuBar {
Q_OBJECT Q_OBJECT
public: public:
static Menu* getInstance(); static Menu* getInstance();
~Menu();
bool isOptionChecked(const QString& menuOption); bool isOptionChecked(const QString& menuOption);
void triggerOption(const QString& menuOption); void triggerOption(const QString& menuOption);
@ -79,7 +80,6 @@ private:
static Menu* _instance; static Menu* _instance;
Menu(); Menu();
~Menu();
typedef void(*settingsAction)(QSettings*, QAction*); typedef void(*settingsAction)(QSettings*, QAction*);
static void loadAction(QSettings* set, QAction* action); static void loadAction(QSettings* set, QAction* action);