Delete singleton instance last, which seems slightly more robust.

This commit is contained in:
Aleric Inglewood
2012-02-01 03:23:55 +01:00
parent 6939d2d70b
commit a4e05eea9d

View File

@@ -151,9 +151,10 @@ public:
*/ */
static void deleteSingleton() static void deleteSingleton()
{ {
delete getData().mSingletonInstance; DERIVED_TYPE* instance = getData().mSingletonInstance;
getData().mSingletonInstance = NULL;
getData().mInitState = DELETED; getData().mInitState = DELETED;
getData().mSingletonInstance = NULL;
delete instance;
} }
static SingletonInstanceData& getData() static SingletonInstanceData& getData()