Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-09 15:29:42 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix script not being loaded at startup

Browse source
This commit is contained in:
Atlante45 2014-07-02 17:54:21 -07:00
parent 45db5e2c40
commit 69533c25c2
1 changed files with 7 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
interface/src/Application.cpp
View file

@ -398,18 +398,19 @@ Application::Application(int& argc, char** argv, QElapsedTimer &startup_time) :
} }
Application::~Application() { Application::~Application() {
qInstallMessageHandler(NULL);
saveSettings();
storeSizeAndPosition();
saveScripts();
int DELAY_TIME = 1000; int DELAY_TIME = 1000;
UserActivityLogger::getInstance().close(DELAY_TIME); UserActivityLogger::getInstance().close(DELAY_TIME);
qInstallMessageHandler(NULL);
// make sure we don't call the idle timer any more // make sure we don't call the idle timer any more
delete idleTimer; delete idleTimer;
_sharedVoxelSystem.changeTree(new VoxelTree); _sharedVoxelSystem.changeTree(new VoxelTree);
saveSettings();
delete _voxelImporter; delete _voxelImporter;
// let the avatar mixer know we're out // let the avatar mixer know we're out
@ -432,8 +433,6 @@ Application::~Application() {
_particleEditSender.terminate(); _particleEditSender.terminate();
_modelEditSender.terminate(); _modelEditSender.terminate();
storeSizeAndPosition();
saveScripts();
VoxelTreeElement::removeDeleteHook(&_voxels); // we don't need to do this processing on shutdown VoxelTreeElement::removeDeleteHook(&_voxels); // we don't need to do this processing on shutdown
Menu::getInstance()->deleteLater(); Menu::getInstance()->deleteLater();