Fix #4029: Expire vector display instances after SVG destruction

Client/mods/deathmatch/logic/CClientVectorGraphic.cpp

@@ -18,7 +18,7 @@ CClientVectorGraphic::CClientVectorGraphic(CClientManager* pManager, ElementID I
 
     m_pManager = pManager;
 
-    m_pVectorGraphicDisplay = std::make_unique<CClientVectorGraphicDisplay>(m_pManager->GetDisplayManager(), this);
+    m_pVectorGraphicDisplay = new 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);

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.get(); }
+    CClientVectorGraphicDisplay* GetDisplay() const { return m_pVectorGraphicDisplay; }
 
     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;
 
-    std::unique_ptr<CClientVectorGraphicDisplay> m_pVectorGraphicDisplay;
+    CClientVectorGraphicDisplay* m_pVectorGraphicDisplay;
 
     std::variant<CLuaFunctionRef, bool> m_updateCallbackRef = false;
 

Client/mods/deathmatch/logic/CClientVectorGraphicDisplay.cpp

@@ -25,8 +25,11 @@ CClientVectorGraphicDisplay::CClientVectorGraphicDisplay(CClientDisplayManager*
 
 void CClientVectorGraphicDisplay::Render()
 {
+    // When the underlying vector graphic is deleted, this display will be destroyed automatically by the manager.
+    // CClientVectorGraphicDisplay::Render should be called as long as the display manager is still alive.
+    // see CClientDisplayManager::DoPulse
     if (!m_pVectorGraphic || m_pVectorGraphic->IsDestroyed())
-        return;
+        return SetTimeTillExpiration(1);
 
     if (!m_bVisible)
     {