From 946ccc4649ddf4743abc518c86a32583245b9d1c Mon Sep 17 00:00:00 2001
From: BenCat07 <BenCat07@gmail.com>
Date: Sun, 5 Jul 2020 18:18:30 +0200
Subject: [PATCH] Fix some crashes

---
 src/hacks/BulletTracers.cpp      | 2 +-
 src/visual/menu/GuiInterface.cpp | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/hacks/BulletTracers.cpp b/src/hacks/BulletTracers.cpp
index 245296a0..edccf8da 100644
--- a/src/hacks/BulletTracers.cpp
+++ b/src/hacks/BulletTracers.cpp
@@ -161,7 +161,7 @@ IClientEntity *GetActiveTFWeapon_detour(IClientEntity *this_ /* C_TFPlayer * */)
     {
         // trace and find where player is aiming
         auto cent = ENTITY(this_->entindex());
-        if (CE_BAD(cent))
+        if (CE_BAD(cent) || !cent->hitboxes.GetHitbox(0))
             return weapon;
         Vector eyePos = cent->hitboxes.GetHitbox(0)->center;
         trace::filter_default.SetSelf(this_);
diff --git a/src/visual/menu/GuiInterface.cpp b/src/visual/menu/GuiInterface.cpp
index 32148523..35606977 100644
--- a/src/visual/menu/GuiInterface.cpp
+++ b/src/visual/menu/GuiInterface.cpp
@@ -148,7 +148,8 @@ void gui::init()
 
 void gui::shutdown()
 {
-    g_IGameEventManager->RemoveListener(&listener);
+    if (init_done)
+        g_IGameEventManager->RemoveListener(&listener);
 }
 
 void gui::draw()