Changeset 3366 for code/branches/resource/src/core/GUIManager.cc

Timestamp:

Jul 29, 2009, 10:27:10 PM (15 years ago)

Author:

rgrieder

Message:

Derived all singletons implemented in a usual manner from orxonox::Singleton<T>.
This resolves inconsistencies with the singletonPtr_s variable in case of exceptions (asserts were being triggered then).
And while at it replaced singletonRef_s with singletonPtr_s for it to be less misleading (as fabian has already pointed out).

File:

• code/branches/resource/src/core/GUIManager.cc (modified) (3 diffs)

code/branches/resource/src/core/GUIManager.cc

@@ -87 +87 @@
     static CEGUI::MouseButton convertButton(MouseButtonCode::ByEnum button);
 
-    GUIManager* GUIManager::singletonRef_s = 0;
+    GUIManager* GUIManager::singletonPtr_s = 0;
 
     /**
@@ -105 +105 @@
         , resourceProvider_(0)
     {
-        assert(singletonRef_s == 0);
-        singletonRef_s = this;
-
         using namespace CEGUI;
 
@@ -161 +158 @@
         // destroy our own tolua interfaces
         LuaBind::getInstance().closeToluaInterfaces(this->luaState_);
-
-        singletonRef_s = 0;
     }