xrRender: fix crash in Linux at exit

OpenXRay · May 5, 2020 · 2d95ed8 · 2d95ed8
1 parent 38add64
commit 2d95ed8
Showing 1 changed file with 16 additions and 0 deletions.
diff --git a/src/Include/xrRender/FactoryPtr.h b/src/Include/xrRender/FactoryPtr.h
@@ -2,6 +2,18 @@
 
 #include "RenderFactory.h"
 
+#ifdef __GNUC__ // At least GCC call destructor of members at call parent destructor
+#define FACTORY_PTR_INSTANCIATE_GNUC(Class)\
+    template <>\
+    inline void FactoryPtr<I##Class>::CreateObject(void)\
+    { m_pObject = GEnv.RenderFactory->Create##Class(); }\
+    template <>\
+    inline void FactoryPtr<I##Class>::DestroyObject(void)\
+    {\
+        m_pObject = NULL;\
+    }
+#endif
+
 #define FACTORY_PTR_INSTANCIATE(Class)\
     template <>\
     inline void FactoryPtr<I##Class>::CreateObject(void)\
@@ -47,7 +59,11 @@ class FactoryPtr
 
 #ifndef _EDITOR
 FACTORY_PTR_INSTANCIATE(UISequenceVideoItem)
+#ifdef __GNUC__ 
+FACTORY_PTR_INSTANCIATE_GNUC(UIShader)
+#else
 FACTORY_PTR_INSTANCIATE(UIShader)
+#endif
 FACTORY_PTR_INSTANCIATE(StatGraphRender)
 FACTORY_PTR_INSTANCIATE(ConsoleRender)
 #ifdef DEBUG