mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-02-07 12:09:38 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fix a crash with double deinitialization

Browse Source
This commit is contained in:
Alexander Bock
2014-11-18 16:07:59 +01:00
parent 6b40cb18fb
commit 2485b12738
1 changed files with 2 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/engine/openspaceengine.cpp
View File

@@ -90,7 +90,6 @@ OpenSpaceEngine::OpenSpaceEngine(std::string programName)
// initialize OpenSpace helpers
SpiceManager::initialize();
Time::initialize();
//DeviceIdentifier::init();
FactoryManager::initialize();
ghoul::systemcapabilities::SystemCapabilities::initialize();
}
@@ -101,13 +100,8 @@ OpenSpaceEngine::~OpenSpaceEngine() {
ghoul::systemcapabilities::SystemCapabilities::deinitialize();
FactoryManager::deinitialize();
//DeviceIdentifier::deinit();
Time::deinitialize();
SpiceManager::deinitialize();
Time::deinitialize();
//DeviceIdentifier::deinit();
FileSystem::deinitialize();
LogManager::deinitialize();
}
OpenSpaceEngine& OpenSpaceEngine::ref() {
@@ -370,8 +364,8 @@ bool OpenSpaceEngine::initialize() {
//DeviceIdentifier::init();
//DeviceIdentifier::ref().scanDevices();
//_interactionHandler.setKeyboardController(new interaction::KeyboardControllerFixed);
_interactionHandler.setKeyboardController(new interaction::KeyboardControllerLua);
_interactionHandler.setKeyboardController(new interaction::KeyboardControllerFixed);
//_interactionHandler.setKeyboardController(new interaction::KeyboardControllerLua);
_interactionHandler.setMouseController(new interaction::TrackballMouseController);
// Run start up scripts