Fix crash that occurs if there is an error in the SGCT configuration file

This commit is contained in:
Alexander Bock
2017-02-22 15:31:59 -05:00
parent 2ee1f9984c
commit 965cf6bd9a
6 changed files with 17 additions and 10 deletions

View File

@@ -175,11 +175,6 @@ OpenSpaceEngine::OpenSpaceEngine(std::string programName,
}
OpenSpaceEngine::~OpenSpaceEngine() {
LINFO("_windowWrapper->isUsingSwapGroups(): " << _windowWrapper->isUsingSwapGroups());
LINFO("_windowWrapper->isSwapGroupMaster(): " << _windowWrapper->isSwapGroupMaster());
_interactionHandler->deinitialize();
_renderEngine->deinitialize();
_globalPropertyNamespace = nullptr;
_windowWrapper = nullptr;
_parallelConnection = nullptr;
@@ -529,6 +524,10 @@ bool OpenSpaceEngine::initialize() {
return true;
}
void OpenSpaceEngine::deinitialize() {
_interactionHandler->deinitialize();
_renderEngine->deinitialize();
}
void OpenSpaceEngine::writeDocumentation() {
// If a LuaDocumentationFile was specified, generate it now