Merge branch 'master' of https://github.com/worklist/hifi into shifty

Andrzej Kapolka committed 13 years ago

Commit 834b6712 parents 0a9db6a fa53e5d43 files · +356 −388Browse files

Showing the changes to interface/src/Menu.cpp (1 of 43 files). Show all

Unified · Split

     addCheckableActionToQMenuAndActionHash(developerMenu, MenuOption::DestructiveAddVoxel);
 }
+Menu::~Menu() {
+    bandwidthDetailsClosed();
+    voxelStatsDetailsClosed();
+}
 void Menu::loadSettings(QSettings* settings) {
     if (!settings) {
         settings = Application::getInstance()->getSettings();
 }
 void Menu::bandwidthDetailsClosed() {
-    delete _bandwidthDialog;
+    if (_bandwidthDialog) {
-    _bandwidthDialog = NULL;
+        delete _bandwidthDialog;
+        _bandwidthDialog = NULL;
+    }
 }
 void Menu::voxelStatsDetails() {
 }
 void Menu::voxelStatsDetailsClosed() {
-    delete _voxelStatsDialog;
+    if (_voxelStatsDialog) {
-    _voxelStatsDialog = NULL;
+        delete _voxelStatsDialog;
+        _voxelStatsDialog = NULL;
+    }
 }
 void Menu::cycleFrustumRenderMode() {