From 7af34aaadded3e73554466e98be1e29f25809315 Mon Sep 17 00:00:00 2001 From: Jonathan G Rennison Date: Fri, 16 Jun 2023 01:21:38 +0100 Subject: [PATCH] Fix NetworkAddChatMessage when MAX_CHAT_MESSAGES is 0 --- src/network/network_chat_gui.cpp | 4 +++- src/network/network_func.h | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/network/network_chat_gui.cpp b/src/network/network_chat_gui.cpp index b71ea7f705..d8dfe0f111 100644 --- a/src/network/network_chat_gui.cpp +++ b/src/network/network_chat_gui.cpp @@ -88,8 +88,10 @@ static inline bool HaveChatMessages(bool show_all) * @param duration The duration of the chat message in seconds * @param message message itself in printf() style */ -void CDECL NetworkAddChatMessage(TextColour colour, uint duration, const std::string &message) +void NetworkAddChatMessage(TextColour colour, uint duration, const std::string_view message) { + if (MAX_CHAT_MESSAGES == 0) return; + if (_chatmsg_list.size() == MAX_CHAT_MESSAGES) { _chatmsg_list.pop_back(); } diff --git a/src/network/network_func.h b/src/network/network_func.h index ae695f99a6..be465545f5 100644 --- a/src/network/network_func.h +++ b/src/network/network_func.h @@ -94,7 +94,7 @@ uint NetworkServerKickOrBanIP(const std::string &ip, bool ban, const std::string void NetworkInitChatMessage(); void NetworkReInitChatBoxSize(); -void CDECL NetworkAddChatMessage(TextColour colour, uint duration, const std::string &message); +void NetworkAddChatMessage(TextColour colour, uint duration, const std::string_view message); void NetworkUndrawChatMessage(); void NetworkChatMessageLoop();