From 64e1594b4179688e79a5fa01193239af73c9174a Mon Sep 17 00:00:00 2001
From: cc9cii <cc9c@iinet.net.au>
Date: Mon, 1 Dec 2014 14:08:27 +1100
Subject: [PATCH] Move the destruction of global resources, being used by
 multiple documents, to the editor.

---
 apps/opencs/editor.cpp               | 7 ++++++-
 apps/opencs/view/doc/viewmanager.cpp | 4 ----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/apps/opencs/editor.cpp b/apps/opencs/editor.cpp
index e756cb5df..53c6865eb 100644
--- a/apps/opencs/editor.cpp
+++ b/apps/opencs/editor.cpp
@@ -1,6 +1,8 @@
 
 #include "editor.hpp"
 
+#include <openengine/bullet/BulletShapeLoader.h>
+
 #include <QApplication>
 #include <QLocalServer>
 #include <QLocalSocket>
@@ -69,7 +71,10 @@ CS::Editor::Editor (OgreInit::OgreInit& ogreInit)
 }
 
 CS::Editor::~Editor ()
-{}
+{
+    // cleanup global resources used by OEngine
+    delete OEngine::Physic::BulletShapeManager::getSingletonPtr();
+}
 
 void CS::Editor::setupDataFiles (const Files::PathContainer& dataDirs)
 {
diff --git a/apps/opencs/view/doc/viewmanager.cpp b/apps/opencs/view/doc/viewmanager.cpp
index 55fd38c18..5f6b6b46a 100644
--- a/apps/opencs/view/doc/viewmanager.cpp
+++ b/apps/opencs/view/doc/viewmanager.cpp
@@ -6,8 +6,6 @@
 #include <QApplication>
 #include <QDesktopWidget>
 
-#include <openengine/bullet/BulletShapeLoader.h>
-
 #include "../../model/doc/documentmanager.hpp"
 #include "../../model/doc/document.hpp"
 #include "../../model/world/columns.hpp"
@@ -220,8 +218,6 @@ void CSVDoc::ViewManager::removeDocAndView (CSMDoc::Document *document)
             mDocumentManager.removeDocument(document);
             (*iter)->deleteLater();
             mViews.erase (iter);
-            // cleanup global resources used by OEngine
-            delete OEngine::Physic::BulletShapeManager::getSingletonPtr();
 
             updateIndices();
             return;