Techwizz/pvpgn-server
1
0
Fork 0
Code Issues68 Pull requests2 Projects Releases8 Packages Wiki Activity Actions

Fixed bug that occurred when _find_string returned NULL

Browse source
This commit is contained in:
relesgoe 2020-05-29 13:46:32 -07:00
parent b5d8be8271
commit e0e95bb748
1 changed files with 7 additions and 8 deletions

15
src/bnetd/i18n.h
View file

@ -91,16 +91,15 @@ namespace pvpgn
try
{
t_gamelang lang;
const char *format = fmt::to_string(format_str).c_str();
if (lang = conn_get_gamelang_localized(c))
const char* format = nullptr;
if ((lang = conn_get_gamelang_localized(c)) && (format = _find_string(fmt::to_string(format_str).c_str(), lang)))
{
if (!(format = _find_string(fmt::to_string(format_str).c_str(), lang)))
{
format = fmt::to_string(format_str).c_str(); // if not found use original
}
output = fmt::format(format, args...);
}
else
{
output = fmt::format(format_str, args...);
}
output = fmt::format(format, args...);
char tmp[MAX_MESSAGE_LEN];
std::snprintf(tmp, sizeof tmp, "%s", output.c_str());