Fix #8962 (Destroying browser onClientGUIClick result instant crash)

Author: jushar

Client/mods/deathmatch/logic/CClientWebBrowser.cpp

@@ -335,8 +335,9 @@ CClientGUIWebBrowser::CClientGUIWebBrowser ( bool isLocal, bool isTransparent, u
     : CClientGUIElement ( pManager, pLuaMain, pCGUIElement, ID )
 {
     m_pManager = pManager;
-    m_pBrowser = g_pClientGame->GetManager ()->GetRenderElementManager ()->CreateWebBrowser ( width, height, isLocal, isTransparent );
-    m_pBrowser->SetParent ( this ); // m_pBrowser gets deleted automatically by the element tree logic
+    m_pBrowser.reset(g_pClientGame->GetManager()->GetRenderElementManager()->CreateWebBrowser(width, height, isLocal, isTransparent));
+    m_pBrowser->SetParent(this); // Memory management is no longer done via element tree logic, but is kept here for backwards compatibility
+    m_pBrowser->MakeSystemEntity(); // Mark element as system entity so it isn't destroyed automatically
 
     // Set our owner resource
     m_pBrowser->SetResource ( pLuaMain->GetResource () );

Client/mods/deathmatch/logic/CClientWebBrowser.h

@@ -7,10 +7,9 @@
 *  PURPOSE:     ClientEntity webbrowser tab class
 *
 *****************************************************************************/
+#pragma once
 
-#ifndef __CCLIENTWEBBROWSER_H
-#define __CCLIENTWEBBROWSER_H
-
+#include <memory>
 #include <core/CWebViewInterface.h>
 #include <core/CAjaxResourceHandlerInterface.h>
 #include <core/CWebBrowserEventsInterface.h>
@@ -96,10 +95,8 @@ class CClientGUIWebBrowser : public CClientGUIElement
 public:
     CClientGUIWebBrowser ( bool isLocal, bool isTransparent, uint width, uint height, CClientManager* pManager, CLuaMain* pLuaMain, CGUIElement* pCGUIElement, ElementID ID = INVALID_ELEMENT_ID );
 
-    inline CClientWebBrowser* GetBrowser () { return m_pBrowser; }
+    inline CClientWebBrowser* GetBrowser () { return m_pBrowser.get(); }
 
 private:
-    CClientWebBrowser* m_pBrowser;
+    std::unique_ptr<CClientWebBrowser> m_pBrowser;
 };
-
-#endif