piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2024-11-15 05:47:56 -07:00
Code Issues Actions Packages Projects Releases Wiki Activity

Improve thread safety and remove an unnecessary string allocation from MsgAlert

Browse Source 
s_msg_handler still seems thread unsafe, not sure if it should be or not
This commit is contained in:
Silent 2019-07-20 21:03:45 +02:00
parent fc8859a414
commit e792a67dc6
No known key found for this signature in database
GPG Key ID: AE53149BB0C45AF1
1 changed files with 11 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
Source/Core/Common/MsgHandler.cpp
View File

@ -83,35 +83,27 @@ std::string GetStringT(const char* string)
bool MsgAlert(bool yes_no, MsgType style, const char* format, ...) bool MsgAlert(bool yes_no, MsgType style, const char* format, ...)
{ {
// Read message and write it to the log // Read message and write it to the log
std::string caption; const char* caption = "";
char buffer[2048]; char buffer[2048];
static std::string info_caption; static const std::string info_caption = s_str_translator(_trans("Information"));
static std::string warn_caption; static const std::string warn_caption = s_str_translator(_trans("Question"));
static std::string ques_caption; static const std::string ques_caption = s_str_translator(_trans("Warning"));
static std::string crit_caption; static const std::string crit_caption = s_str_translator(_trans("Critical"));
if (info_caption.empty())
{
info_caption = s_str_translator(_trans("Information"));
ques_caption = s_str_translator(_trans("Question"));
warn_caption = s_str_translator(_trans("Warning"));
crit_caption = s_str_translator(_trans("Critical"));
}
switch (style) switch (style)
{ {
case MsgType::Information: case MsgType::Information:
caption = info_caption; caption = info_caption.c_str();
break; break;
case MsgType::Question: case MsgType::Question:
caption = ques_caption; caption = ques_caption.c_str();
break; break;
case MsgType::Warning: case MsgType::Warning:
caption = warn_caption; caption = warn_caption.c_str();
break; break;
case MsgType::Critical: case MsgType::Critical:
caption = crit_caption; caption = crit_caption.c_str();
break; break;
} }
@ -120,13 +112,13 @@ bool MsgAlert(bool yes_no, MsgType style, const char* format, ...)
CharArrayFromFormatV(buffer, sizeof(buffer) - 1, s_str_translator(format).c_str(), args); CharArrayFromFormatV(buffer, sizeof(buffer) - 1, s_str_translator(format).c_str(), args);
va_end(args); va_end(args);
ERROR_LOG(MASTER_LOG, "%s: %s", caption.c_str(), buffer); ERROR_LOG(MASTER_LOG, "%s: %s", caption, buffer);
// Don't ignore questions, especially AskYesNo, PanicYesNo could be ignored // Don't ignore questions, especially AskYesNo, PanicYesNo could be ignored
if (s_msg_handler != nullptr && if (s_msg_handler != nullptr &&
(s_alert_enabled || style == MsgType::Question || style == MsgType::Critical)) (s_alert_enabled || style == MsgType::Question || style == MsgType::Critical))
{ {
return s_msg_handler(caption.c_str(), buffer, yes_no, style); return s_msg_handler(caption, buffer, yes_no, style);
} }
return true; return true;