From 3ec98bf2410bb8fa73fe6b386a6e766bef575e97 Mon Sep 17 00:00:00 2001
From: Treeston <treeston.mmoc@gmail.com>
Date: Thu, 8 Oct 2020 16:45:20 +0200
Subject: Core/ChatCommands: Fix a potential crash if a custom chat command
 does not have a specified help string

---
 src/server/game/Chat/ChatCommands/ChatCommand.cpp | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'src/server/game/Chat/ChatCommands')

diff --git a/src/server/game/Chat/ChatCommands/ChatCommand.cpp b/src/server/game/Chat/ChatCommands/ChatCommand.cpp
index add4d4a0686..f8b01feca33 100644
--- a/src/server/game/Chat/ChatCommands/ChatCommand.cpp
+++ b/src/server/game/Chat/ChatCommands/ChatCommand.cpp
@@ -173,8 +173,13 @@ void Trinity::Impl::ChatCommands::ChatCommandNode::SendCommandHelp(ChatHandler&
     {
         if (std::holds_alternative<TrinityStrings>(_help))
             handler.SendSysMessage(std::get<TrinityStrings>(_help));
-        else
+        else if (std::holds_alternative<std::string>(_help))
             handler.SendSysMessage(std::get<std::string>(_help));
+        else
+        {
+            handler.PSendSysMessage(LANG_CMD_HELP_GENERIC, STRING_VIEW_FMT_ARG(_name));
+            handler.PSendSysMessage(LANG_CMD_NO_HELP_AVAILABLE, STRING_VIEW_FMT_ARG(_name));
+        }
     }
 
     bool header = false;
-- 
cgit v1.2.3