From 2485b127388c0c4a2a466ff064dbea771e0af797 Mon Sep 17 00:00:00 2001
From: Alexander Bock <alexander.bock@liu.se>
Date: Tue, 18 Nov 2014 16:07:59 +0100
Subject: [PATCH] Fix a crash with double deinitialization

---
 src/engine/openspaceengine.cpp | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/src/engine/openspaceengine.cpp b/src/engine/openspaceengine.cpp
index 216976614c..8a66b95b0e 100644
--- a/src/engine/openspaceengine.cpp
+++ b/src/engine/openspaceengine.cpp
@@ -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