Delete singleton instance last, which seems slightly more robust.

2012-02-01 03:23:55 +01:00
parent 6939d2d70b
commit a4e05eea9d
1 changed files with 3 additions and 2 deletions
--- a/indra/llcommon/llsingleton.h
+++ b/indra/llcommon/llsingleton.h
@@ -151,9 +151,10 @@ public:
 	 */
 	static void deleteSingleton()
 	{
-		delete getData().mSingletonInstance;
-		getData().mSingletonInstance = NULL;
+		DERIVED_TYPE* instance = getData().mSingletonInstance;
 		getData().mInitState = DELETED;
+		getData().mSingletonInstance = NULL;
+		delete instance;
 	}

 	static SingletonInstanceData& getData()