possible_fix(menus): Crashes

Author: skuzzis

src/engine/vgui/screentext.cpp

@@ -63,6 +63,7 @@ void ScreenText::SetupViewForPlayer(Player* player)
 {
     m_player = player;
 
+    if (!pScreenEntity.IsValid()) return;
     if (!pScreenEntity) return;
     if (!player) return;
     if (player->IsFakeClient()) return;
@@ -78,6 +79,7 @@ void ScreenText::SetText(std::string text)
 {
     m_text = text;
 
+    if (!pScreenEntity.IsValid()) return;
     if (!pScreenEntity) return;
 
     g_entSystem.AcceptInput(pScreenEntity.Get(), "SetMessage", nullptr, nullptr, m_text, 0);
@@ -91,6 +93,7 @@ void ScreenText::SetPosition(float posX, float posY)
 
     if (!m_player) return;
     if (m_player->IsFakeClient()) return;
+    if (!pScreenEntity.IsValid()) return;
     if (!pScreenEntity) return;
 
     auto pawn = m_player->GetPlayerPawn();
@@ -148,6 +151,7 @@ void ScreenText::SetColor(Color color)
 {
     m_col = color;
 
+    if (!pScreenEntity.IsValid()) return;
     if (!pScreenEntity) return;
     schema::SetProp(pScreenEntity.Get(), "CPointWorldText", "m_Color", color);
 }
@@ -180,6 +184,7 @@ Player* ScreenText::GetPlayer()
 
 int ScreenText::GetEntityIndex()
 {
+    if (!pScreenEntity.IsValid()) return 0;
     if (!pScreenEntity) return 0;
 
     return pScreenEntity->GetEntityIndex().Get();

src/server/menus/MenuRenderer.cpp

@@ -36,22 +36,12 @@ void EmitSoundFilter(int playerid, std::string sound_name, float pitch, float vo
 MenuRenderer::MenuRenderer(Player* player)
 {
     m_player = player;
-
-    CPlayerSlot slot = player->GetSlot();
-
-    centerMessageEvent = g_gameEventManager->CreateEvent("show_survival_respawn_status", true);
-    centerMessageEvent->SetUint64("duration", 1);
-    centerMessageEvent->SetInt("userid", slot.Get());
-
-    playerListener = g_GameData.FetchSignature<GetLegacyGameEventListener>("LegacyGameEventListener")(slot);
-
     menu = nullptr;
 }
 
 MenuRenderer::~MenuRenderer()
 {
     HideMenu();
-    g_gameEventManager->FreeEvent(centerMessageEvent);
 }
 
 void MenuRenderer::ShowMenu(std::string menu_id)
@@ -101,24 +91,23 @@ void MenuRenderer::HideMenu()
     selected = 0;
 
     std::string kind = menu->GetKind();
-    if (menu->IsTemporary()) {
-        std::string menuID = menu->GetID();
-        g_MenuManager.UnregisterMenu(menuID);
-    }
-
-    menu = nullptr;
-
     if (kind == "center") {
         if (centerMessageEvent) {
             centerMessageEvent->SetString("loc_token", "Exiting...");
-            playerListener->FireGameEvent(centerMessageEvent);
+            g_GameData.FetchSignature<GetLegacyGameEventListener>("LegacyGameEventListener")(m_player->GetSlot())->FireGameEvent(centerMessageEvent);
+            g_gameEventManager->FreeEvent(centerMessageEvent);
         }
     }
     else if (kind == "screen") {
         g_VGUI.DeleteScreenText(menuTextID);
-
         menuTextID = 0;
     }
+
+    if (menu->IsTemporary()) {
+        std::string menuID = menu->GetID();
+        g_MenuManager.UnregisterMenu(menuID);
+    }
+    menu = nullptr;
 }
 
 bool MenuRenderer::HasMenuShown()
@@ -167,6 +156,9 @@ void MenuRenderer::RenderMenu() {
     if (!menu) return;
     std::string kind = menu->GetKind();
     if (kind == "center") {
+        centerMessageEvent = g_gameEventManager->CreateEvent("show_survival_respawn_status", true);
+        centerMessageEvent->SetUint64("duration", 1);
+        centerMessageEvent->SetInt("userid", m_player->GetSlot());
         centerMessageEvent->SetString("loc_token", menu->GeneratedItems(m_player->GetSlot(), page).c_str());
     }
     else if (kind == "screen") {
@@ -184,9 +176,10 @@ void MenuRenderer::RenderMenuTick()
 
     std::string kind = menu->GetKind();
     if (kind == "center") {
-        if (!playerListener) return;
+        auto listener = g_GameData.FetchSignature<GetLegacyGameEventListener>("LegacyGameEventListener")(m_player->GetSlot());
+        if (!listener) return;
         if (!centerMessageEvent) return;
-        playerListener->FireGameEvent(centerMessageEvent);
+        listener->FireGameEvent(centerMessageEvent);
     }
 }