From 2bde14b7286fc107699daea8fdc1ff2f506c3f8d Mon Sep 17 00:00:00 2001
From: Alexander Bock <alexander.bock@liu.se>
Date: Fri, 26 Jun 2015 19:20:56 +0200
Subject: [PATCH] Fix crash that happens when SpiceManager is deinitialized

---
 include/openspace/util/spicemanager.h | 2 --
 src/util/spicemanager.cpp             | 4 +---
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/include/openspace/util/spicemanager.h b/include/openspace/util/spicemanager.h
index 4ffe0383c3..1a8df376ac 100644
--- a/include/openspace/util/spicemanager.h
+++ b/include/openspace/util/spicemanager.h
@@ -718,8 +718,6 @@ protected:
 
     /// The last assigned kernel-id, used to determine the next free kernel id
     KernelIdentifier _lastAssignedKernel;
-
-    static SpiceManager* _manager;
 };
 
 } // namespace openspace
diff --git a/src/util/spicemanager.cpp b/src/util/spicemanager.cpp
index fea22903c9..5a806ea244 100644
--- a/src/util/spicemanager.cpp
+++ b/src/util/spicemanager.cpp
@@ -40,8 +40,6 @@ namespace {
 
 namespace openspace {
 
-SpiceManager* SpiceManager::_manager = nullptr;
-
 SpiceManager::SpiceManager() 
     : _lastAssignedKernel(0)
 {
@@ -52,7 +50,7 @@ SpiceManager::SpiceManager()
 }
 
 SpiceManager::~SpiceManager() {
-    for (const KernelInformation& i : _manager->_loadedKernels)
+    for (const KernelInformation& i : _loadedKernels)
         unload_c(i.path.c_str());
 
     // Set values back to default