From 8ee90715bd34cb1a065178cc6292ff42e19b5f71 Mon Sep 17 00:00:00 2001 From: Ryan Huffman Date: Tue, 29 Apr 2014 17:20:15 -0700 Subject: [PATCH] Revert changes to call to saveSettings in Application --- interface/src/Application.cpp | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp index f93b2b7f68..a2c10c02cd 100644 --- a/interface/src/Application.cpp +++ b/interface/src/Application.cpp @@ -370,15 +370,11 @@ Application::~Application() { // make sure we don't call the idle timer any more delete idleTimer; - Menu::getInstance()->saveSettings(); - _rearMirrorTools->saveSettings(_settings); - _sharedVoxelSystem.changeTree(new VoxelTree); - if (_voxelImporter) { - _voxelImporter->saveSettings(_settings); - delete _voxelImporter; - } - _settings->sync(); + + saveSettings(); + + delete _voxelImporter; // let the avatar mixer know we're out MyAvatar::sendKillAvatar();