Use shared_ptr

Author: Lpsd

Client/mods/deathmatch/logic/CClientVectorGraphic.cpp

@@ -18,7 +18,7 @@ CClientVectorGraphic::CClientVectorGraphic(CClientManager* pManager, ElementID I
 
     m_pManager = pManager;
 
-    m_pVectorGraphicDisplay = new CClientVectorGraphicDisplay(m_pManager->GetDisplayManager(), this);
+    m_pVectorGraphicDisplay = std::make_shared<CClientVectorGraphicDisplay>(m_pManager->GetDisplayManager(), this);
 
     // Generate the default XML document
     SString defaultXmlString = SString("<svg viewBox='0 0 %u %u'></svg>", pVectorGraphicItem->m_uiSizeX, pVectorGraphicItem->m_uiSizeY);
@@ -46,7 +46,7 @@ bool CClientVectorGraphic::LoadFromString(std::string strData)
 
 bool CClientVectorGraphic::SetDocument(CXMLNode* node)
 {
-    if (!node || !node->IsValid())
+    if (!m_pVectorGraphicDisplay || !node || !node->IsValid())
         return false;
 
     if (m_pXMLString && m_pXMLString->node != node)
@@ -80,6 +80,9 @@ bool CClientVectorGraphic::RemoveUpdateCallback()
 
 void CClientVectorGraphic::OnUpdate()
 {
+    if (!m_pVectorGraphicDisplay)
+        return;
+
     m_pVectorGraphicDisplay->UpdateTexture();
 
     if (std::holds_alternative<CLuaFunctionRef>(m_updateCallbackRef))

Client/mods/deathmatch/logic/CClientVectorGraphic.h

@@ -36,7 +36,7 @@ class CClientVectorGraphic final : public CClientTexture
     lunasvg::Document* GetSVGDocument() const { return m_pSVGDocument.get(); }
     CXMLNode*          GetXMLDocument() const { return m_pXMLDocument; }
 
-    CClientVectorGraphicDisplay* GetDisplay() const { return m_pVectorGraphicDisplay; }
+    CClientVectorGraphicDisplay* GetDisplay() const { return m_pVectorGraphicDisplay.get(); }
 
     bool IsDisplayCleared() const { return m_pVectorGraphicDisplay->IsCleared(); }
     bool IsDestroyed() const { return m_bIsDestroyed; }
@@ -57,7 +57,7 @@ class CClientVectorGraphic final : public CClientTexture
     std::unique_ptr<SXMLString>        m_pXMLString = nullptr;
     CXMLNode*                          m_pXMLDocument = nullptr;
 
-    CClientVectorGraphicDisplay* m_pVectorGraphicDisplay;
+    std::shared_ptr<CClientVectorGraphicDisplay> m_pVectorGraphicDisplay;
 
     std::variant<CLuaFunctionRef, bool> m_updateCallbackRef = false;